diff for duplicates of <201307051441.57325.heiko@sntech.de> diff --git a/a/1.txt b/N1/1.txt index cbeb9bb..2a315f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ This adds the device-node and config select to enable the scu in all Rockchip Cortex-A9 SoCs. -Signed-off-by: Heiko Stuebner <heiko@sntech.de> -Tested-by: Ulrich Prinz <ulrich.prinz@googlemail.com> +Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> +Tested-by: Ulrich Prinz <ulrich.prinz-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> --- arch/arm/boot/dts/rk3066a.dtsi | 5 +++++ arch/arm/mach-rockchip/Kconfig | 1 + @@ -16,12 +16,12 @@ index 56bfac9..26c4311 100644 compatible = "simple-bus"; ranges; -+ scu at 1013c000 { ++ scu@1013c000 { + compatible = "arm,cortex-a9-scu"; + reg = <0x1013c000 0x100>; + }; + - gic: interrupt-controller at 1013d000 { + gic: interrupt-controller@1013d000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig diff --git a/a/content_digest b/N1/content_digest index 641548b..ef5a5da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,24 @@ "ref\0201307051440.19428.heiko@sntech.de\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "ref\0201307051440.19428.heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org\0" + "From\0Heiko St\303\274bner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" "Subject\0[PATCH v3 3/6] ARM: rockchip: add snoop-control-unit\0" "Date\0Fri, 5 Jul 2013 14:41:57 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\0" + "Cc\0Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>" + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Ulrich Prinz <ulrich.prinz-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> + Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" "\00:1\0" "b\0" "This adds the device-node and config select to enable the\n" "scu in all Rockchip Cortex-A9 SoCs.\n" "\n" - "Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" - "Tested-by: Ulrich Prinz <ulrich.prinz@googlemail.com>\n" + "Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\n" + "Tested-by: Ulrich Prinz <ulrich.prinz-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/rk3066a.dtsi | 5 +++++\n" " arch/arm/mach-rockchip/Kconfig | 1 +\n" @@ -23,12 +32,12 @@ " \t\tcompatible = \"simple-bus\";\n" " \t\tranges;\n" " \n" - "+\t\tscu at 1013c000 {\n" + "+\t\tscu@1013c000 {\n" "+\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "+\t\t\treg = <0x1013c000 0x100>;\n" "+\t\t};\n" "+\n" - " \t\tgic: interrupt-controller at 1013d000 {\n" + " \t\tgic: interrupt-controller@1013d000 {\n" " \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" " \t\t\tinterrupt-controller;\n" "diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig\n" @@ -46,4 +55,4 @@ "-- \n" 1.7.10.4 -6341cd6d3b0d4b7ac3d7831d863901d56cac415b8646d467dcd5be1aac708ddf +d8f15ffbd3f6702402eb49d379baa76d910dae8b11da6b3d60227b19ca81ab8f
diff --git a/a/1.txt b/N2/1.txt index cbeb9bb..d2355cf 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,12 +16,12 @@ index 56bfac9..26c4311 100644 compatible = "simple-bus"; ranges; -+ scu at 1013c000 { ++ scu@1013c000 { + compatible = "arm,cortex-a9-scu"; + reg = <0x1013c000 0x100>; + }; + - gic: interrupt-controller at 1013d000 { + gic: interrupt-controller@1013d000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig diff --git a/a/content_digest b/N2/content_digest index 641548b..aa11570 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\0201307051440.19428.heiko@sntech.de\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" "Subject\0[PATCH v3 3/6] ARM: rockchip: add snoop-control-unit\0" "Date\0Fri, 5 Jul 2013 14:41:57 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Olof Johansson <olof@lixom.net>" + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + Grant Likely <grant.likely@linaro.org> + Rob Herring <robherring2@gmail.com> + devicetree-discuss@lists.ozlabs.org + Russell King <linux@arm.linux.org.uk> + Philipp Zabel <p.zabel@pengutronix.de> + linux-kernel@vger.kernel.org + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + " Ulrich Prinz <ulrich.prinz@googlemail.com>\0" "\00:1\0" "b\0" "This adds the device-node and config select to enable the\n" @@ -23,12 +33,12 @@ " \t\tcompatible = \"simple-bus\";\n" " \t\tranges;\n" " \n" - "+\t\tscu at 1013c000 {\n" + "+\t\tscu@1013c000 {\n" "+\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "+\t\t\treg = <0x1013c000 0x100>;\n" "+\t\t};\n" "+\n" - " \t\tgic: interrupt-controller at 1013d000 {\n" + " \t\tgic: interrupt-controller@1013d000 {\n" " \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" " \t\t\tinterrupt-controller;\n" "diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig\n" @@ -46,4 +56,4 @@ "-- \n" 1.7.10.4 -6341cd6d3b0d4b7ac3d7831d863901d56cac415b8646d467dcd5be1aac708ddf +e177b68319192a6a69277b560b4a9fa9ecc7cb49cbdd7dc87e48014bef6b9627
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.