diff for duplicates of <20140604232351.618108720@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index 223ba5e..1c8b02b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,8 +13,8 @@ memory. Fix the data so that all parsing code can handle it correctly. Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> -Cc: linux-arm-kernel at lists.infradead.org -Cc: devicetree at vger.kernel.org +Cc: linux-arm-kernel@lists.infradead.org +Cc: devicetree@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -18,6 +18,7 @@ compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; - memory at 0 { + memory@0 { + device_type = "memory"; reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; }; diff --git a/a/content_digest b/N1/content_digest index 0bde24d..b750344 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,17 @@ "ref\020140604232347.966798903@linuxfoundation.org\0" - "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" + "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 3.14 111/228] arm: dts: Fix missing device_type=\"memory\" for ste-ccu8540\0" "Date\0Wed, 4 Jun 2014 16:22:20 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Linus Walleij <linus.walleij@linaro.org> + Leif Lindholm <leif.lindholm@linaro.org> + stable@vger.kernel.org + Grant Likely <grant.likely@linaro.org> + Lee Jones <lee.jones@linaro.org> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "3.14-stable review patch. If anyone has any objections, please let me know.\n" @@ -20,8 +29,8 @@ "Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>\n" "Acked-by: Lee Jones <lee.jones@linaro.org>\n" "Acked-by: Linus Walleij <linus.walleij@linaro.org>\n" - "Cc: linux-arm-kernel at lists.infradead.org\n" - "Cc: devicetree at vger.kernel.org\n" + "Cc: linux-arm-kernel@lists.infradead.org\n" + "Cc: devicetree@vger.kernel.org\n" "Cc: Mark Rutland <mark.rutland@arm.com>\n" "Signed-off-by: Grant Likely <grant.likely@linaro.org>\n" "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" @@ -35,9 +44,9 @@ "@@ -18,6 +18,7 @@\n" " \tcompatible = \"st-ericsson,ccu8540\", \"st-ericsson,u8540\";\n" " \n" - " \tmemory at 0 {\n" + " \tmemory@0 {\n" "+\t\tdevice_type = \"memory\";\n" " \t\treg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;\n" " \t};" -8f872570d3aef1cf0688fb5e7fcedea69bfbd25fada983a3c4497e384e2a843f +9d87958c2ed4a8de514fe425e37d1d33476d5fc042affef591cd5b97f69190d2
diff --git a/a/1.txt b/N2/1.txt index 223ba5e..1c8b02b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,8 +13,8 @@ memory. Fix the data so that all parsing code can handle it correctly. Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> -Cc: linux-arm-kernel at lists.infradead.org -Cc: devicetree at vger.kernel.org +Cc: linux-arm-kernel@lists.infradead.org +Cc: devicetree@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -18,6 +18,7 @@ compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; - memory at 0 { + memory@0 { + device_type = "memory"; reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; }; diff --git a/a/content_digest b/N2/content_digest index 0bde24d..585a993 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,17 @@ "ref\020140604232347.966798903@linuxfoundation.org\0" - "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" + "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 3.14 111/228] arm: dts: Fix missing device_type=\"memory\" for ste-ccu8540\0" "Date\0Wed, 4 Jun 2014 16:22:20 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" + stable@vger.kernel.org + Leif Lindholm <leif.lindholm@linaro.org> + Lee Jones <lee.jones@linaro.org> + Linus Walleij <linus.walleij@linaro.org> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + Mark Rutland <mark.rutland@arm.com> + " Grant Likely <grant.likely@linaro.org>\0" "\00:1\0" "b\0" "3.14-stable review patch. If anyone has any objections, please let me know.\n" @@ -20,8 +29,8 @@ "Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>\n" "Acked-by: Lee Jones <lee.jones@linaro.org>\n" "Acked-by: Linus Walleij <linus.walleij@linaro.org>\n" - "Cc: linux-arm-kernel at lists.infradead.org\n" - "Cc: devicetree at vger.kernel.org\n" + "Cc: linux-arm-kernel@lists.infradead.org\n" + "Cc: devicetree@vger.kernel.org\n" "Cc: Mark Rutland <mark.rutland@arm.com>\n" "Signed-off-by: Grant Likely <grant.likely@linaro.org>\n" "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" @@ -35,9 +44,9 @@ "@@ -18,6 +18,7 @@\n" " \tcompatible = \"st-ericsson,ccu8540\", \"st-ericsson,u8540\";\n" " \n" - " \tmemory at 0 {\n" + " \tmemory@0 {\n" "+\t\tdevice_type = \"memory\";\n" " \t\treg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;\n" " \t};" -8f872570d3aef1cf0688fb5e7fcedea69bfbd25fada983a3c4497e384e2a843f +761ccff79c161ceebd40782d6b3cef74ffb30931fcc6bbe0ccaf55336581ab86
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.