This is a note to let you know that I've just added the patch titled
ARM: dts: kirkwood: use unique machine name for ds112
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-dts-kirkwood-use-unique-machine-name-for-ds112.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9d021c9d1b4b774a35d8a03d58dbf029544debda Mon Sep 17 00:00:00 2001
From: Heinrich Schuchardt <xypron.glpk@xxxxxx>
Date: Sun, 7 Feb 2016 19:34:26 +0100
Subject: ARM: dts: kirkwood: use unique machine name for ds112
From: Heinrich Schuchardt <xypron.glpk@xxxxxx>
commit 9d021c9d1b4b774a35d8a03d58dbf029544debda upstream.
Downstream packages like Debian flash-kernel use
/proc/device-tree/model
to determine which dtb file to install.
Hence each dts in the Linux kernel should provide a unique model
identifier.
Commit 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS
devices") created the new files kirkwood-ds111.dts and kirkwood-ds112.dts
using the same model identifier.
This patch provides a unique model identifier for the
Synology DiskStation DS112.
Fixes: 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
Reviewed-by: Andrew Lunn <andrew@xxxxxxx>
Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/boot/dts/kirkwood-ds112.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm/boot/dts/kirkwood-ds112.dts
+++ b/arch/arm/boot/dts/kirkwood-ds112.dts
@@ -14,7 +14,7 @@
#include "kirkwood-synology.dtsi"
/ {
- model = "Synology DS111";
+ model = "Synology DS112";
compatible = "synology,ds111", "marvell,kirkwood";
memory {
Patches currently in stable-queue which might be from xypron.glpk@xxxxxx are
queue-4.4/arm-dts-kirkwood-use-unique-machine-name-for-ds112.patch
queue-4.4/arm-dts-kirkwood-add-kirkwood-ds112.dtb-to-makefile.patch
