diff for duplicates of <1474054971-16831-10-git-send-email-krzk@kernel.org>
diff --git a/a/1.txt b/N1/1.txt
index 3b7f03a..2e2cc64 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,11 +5,11 @@ generates an error:
The GIC requires shared interrupts to be edge rising or level high.
Platform declares support for both. Choose level high everywhere.
-Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
-Reported-by: Alban Browaeys <alban.browaeys@gmail.com>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
+Reported-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
+Reported-by: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
+Reported-by: Alban Browaeys <alban.browaeys-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+Cc: Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org>
+Signed-off-by: Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
arch/arm/boot/dts/exynos5260.dtsi | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
@@ -143,4 +143,9 @@ index a86a4898d077..b0848a3d3d88 100644
#size-cells = <0>;
clocks = <&clock_fsys FSYS_CLK_MMC2>, <&clock_top TOP_SCLK_MMC2>;
--
-2.7.4
\ No newline at end of file
+2.7.4
+
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index a9cf50f..ac2722d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,10 @@
"ref\0001474054971-16831-1-git-send-email-krzk\@kernel.org\0"
]
[
- "From\0Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "ref\0001474054971-16831-1-git-send-email-krzk-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org\0"
+]
+[
+ "From\0Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>\0"
]
[
"Subject\0[PATCH 09/10] ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5260\0"
@@ -11,20 +14,20 @@
"Date\0Fri, 16 Sep 2016 21:42:50 +0200\0"
]
[
- "To\0Kukjin Kim <kgene\@kernel.org>",
- " Krzysztof Kozlowski <krzk\@kernel.org>",
- " Javier Martinez Canillas <javier\@osg.samsung.com>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-samsung-soc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Javier Martinez Canillas <javier-JPH+aEBZ4P+UEJcrhfAQsw\@public.gmane.org>",
+ " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
]
[
- "Cc\0Marek Szyprowski <m.szyprowski\@samsung.com>",
- " Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Alban Browaeys <alban.browaeys\@gmail.com>",
- " Marc Zyngier <marc.zyngier\@arm.com>\0"
+ "Cc\0Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>",
+ " Bartlomiej Zolnierkiewicz <b.zolnierkie-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>",
+ " Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g\@public.gmane.org>",
+ " Alban Browaeys <alban.browaeys-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
+ " Marc Zyngier <marc.zyngier-5wv7dgnIgG8\@public.gmane.org>\0"
]
[
"\0000:1\0"
@@ -40,11 +43,11 @@
"The GIC requires shared interrupts to be edge rising or level high.\n",
"Platform declares support for both. Choose level high everywhere.\n",
"\n",
- "Reported-by: Marek Szyprowski <m.szyprowski\@samsung.com>\n",
- "Reported-by: Geert Uytterhoeven <geert\@linux-m68k.org>\n",
- "Reported-by: Alban Browaeys <alban.browaeys\@gmail.com>\n",
- "Cc: Marc Zyngier <marc.zyngier\@arm.com>\n",
- "Signed-off-by: Krzysztof Kozlowski <krzk\@kernel.org>\n",
+ "Reported-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>\n",
+ "Reported-by: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g\@public.gmane.org>\n",
+ "Reported-by: Alban Browaeys <alban.browaeys-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>\n",
+ "Cc: Marc Zyngier <marc.zyngier-5wv7dgnIgG8\@public.gmane.org>\n",
+ "Signed-off-by: Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>\n",
"---\n",
" arch/arm/boot/dts/exynos5260.dtsi | 39 ++++++++++++++++++++++++---------------\n",
" 1 file changed, 24 insertions(+), 15 deletions(-)\n",
@@ -178,7 +181,12 @@
" \t\t\t#size-cells = <0>;\n",
" \t\t\tclocks = <&clock_fsys FSYS_CLK_MMC2>, <&clock_top TOP_SCLK_MMC2>;\n",
"-- \n",
- "2.7.4"
+ "2.7.4\n",
+ "\n",
+ "--\n",
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n",
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
+ "More majordomo info at http://vger.kernel.org/majordomo-info.html"
]
-429a14d22bdd9ca4b53312288e792ea348b1ea9f5a2cb7377da5b06b96e31be6
+fbcbb48de0974509c0d859cfccae696a07641fdf6ee8e57951267650cb3cf5ce
diff --git a/a/1.txt b/N2/1.txt
index 3b7f03a..0f93975 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -48,9 +48,9 @@ index a86a4898d077..b0848a3d3d88 100644
+ <0 129 IRQ_TYPE_LEVEL_HIGH>;
};
- cci: cci@10F00000 {
+ cci: cci at 10F00000 {
@@ -210,25 +219,25 @@
- pinctrl_0: pinctrl@11600000 {
+ pinctrl_0: pinctrl at 11600000 {
compatible = "samsung,exynos5260-pinctrl";
reg = <0x11600000 0x1000>;
- interrupts = <0 79 0>;
@@ -64,23 +64,23 @@ index a86a4898d077..b0848a3d3d88 100644
};
};
- pinctrl_1: pinctrl@12290000 {
+ pinctrl_1: pinctrl at 12290000 {
compatible = "samsung,exynos5260-pinctrl";
reg = <0x12290000 0x1000>;
- interrupts = <0 157 0>;
+ interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;
};
- pinctrl_2: pinctrl@128B0000 {
+ pinctrl_2: pinctrl at 128B0000 {
compatible = "samsung,exynos5260-pinctrl";
reg = <0x128B0000 0x1000>;
- interrupts = <0 243 0>;
+ interrupts = <0 243 IRQ_TYPE_LEVEL_HIGH>;
};
- pmu_system_controller: system-controller@10D50000 {
+ pmu_system_controller: system-controller at 10D50000 {
@@ -239,7 +248,7 @@
- uart0: serial@12C00000 {
+ uart0: serial at 12C00000 {
compatible = "samsung,exynos4210-uart";
reg = <0x12C00000 0x100>;
- interrupts = <0 146 0>;
@@ -89,7 +89,7 @@ index a86a4898d077..b0848a3d3d88 100644
clock-names = "uart", "clk_uart_baud0";
status = "disabled";
@@ -248,7 +257,7 @@
- uart1: serial@12C10000 {
+ uart1: serial at 12C10000 {
compatible = "samsung,exynos4210-uart";
reg = <0x12C10000 0x100>;
- interrupts = <0 147 0>;
@@ -98,7 +98,7 @@ index a86a4898d077..b0848a3d3d88 100644
clock-names = "uart", "clk_uart_baud0";
status = "disabled";
@@ -257,7 +266,7 @@
- uart2: serial@12C20000 {
+ uart2: serial at 12C20000 {
compatible = "samsung,exynos4210-uart";
reg = <0x12C20000 0x100>;
- interrupts = <0 148 0>;
@@ -107,7 +107,7 @@ index a86a4898d077..b0848a3d3d88 100644
clock-names = "uart", "clk_uart_baud0";
status = "disabled";
@@ -266,7 +275,7 @@
- uart3: serial@12860000 {
+ uart3: serial at 12860000 {
compatible = "samsung,exynos4210-uart";
reg = <0x12860000 0x100>;
- interrupts = <0 145 0>;
@@ -116,7 +116,7 @@ index a86a4898d077..b0848a3d3d88 100644
clock-names = "uart", "clk_uart_baud0";
status = "disabled";
@@ -275,7 +284,7 @@
- mmc_0: mmc@12140000 {
+ mmc_0: mmc at 12140000 {
compatible = "samsung,exynos5250-dw-mshc";
reg = <0x12140000 0x2000>;
- interrupts = <0 156 0>;
@@ -125,7 +125,7 @@ index a86a4898d077..b0848a3d3d88 100644
#size-cells = <0>;
clocks = <&clock_fsys FSYS_CLK_MMC0>, <&clock_top TOP_SCLK_MMC0>;
@@ -287,7 +296,7 @@
- mmc_1: mmc@12150000 {
+ mmc_1: mmc at 12150000 {
compatible = "samsung,exynos5250-dw-mshc";
reg = <0x12150000 0x2000>;
- interrupts = <0 158 0>;
@@ -134,7 +134,7 @@ index a86a4898d077..b0848a3d3d88 100644
#size-cells = <0>;
clocks = <&clock_fsys FSYS_CLK_MMC1>, <&clock_top TOP_SCLK_MMC1>;
@@ -299,7 +308,7 @@
- mmc_2: mmc@12160000 {
+ mmc_2: mmc at 12160000 {
compatible = "samsung,exynos5250-dw-mshc";
reg = <0x12160000 0x2000>;
- interrupts = <0 159 0>;
diff --git a/a/content_digest b/N2/content_digest
index a9cf50f..d089519 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001474054971-16831-1-git-send-email-krzk\@kernel.org\0"
]
[
- "From\0Krzysztof Kozlowski <krzk\@kernel.org>\0"
+ "From\0krzk\@kernel.org (Krzysztof Kozlowski)\0"
]
[
"Subject\0[PATCH 09/10] ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5260\0"
@@ -11,20 +11,7 @@
"Date\0Fri, 16 Sep 2016 21:42:50 +0200\0"
]
[
- "To\0Kukjin Kim <kgene\@kernel.org>",
- " Krzysztof Kozlowski <krzk\@kernel.org>",
- " Javier Martinez Canillas <javier\@osg.samsung.com>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-samsung-soc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0Marek Szyprowski <m.szyprowski\@samsung.com>",
- " Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Alban Browaeys <alban.browaeys\@gmail.com>",
- " Marc Zyngier <marc.zyngier\@arm.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -83,9 +70,9 @@
"+\t\t\t\t <0 129 IRQ_TYPE_LEVEL_HIGH>;\n",
" \t\t};\n",
" \n",
- " \t\tcci: cci\@10F00000 {\n",
+ " \t\tcci: cci at 10F00000 {\n",
"\@\@ -210,25 +219,25 \@\@\n",
- " \t\tpinctrl_0: pinctrl\@11600000 {\n",
+ " \t\tpinctrl_0: pinctrl at 11600000 {\n",
" \t\t\tcompatible = \"samsung,exynos5260-pinctrl\";\n",
" \t\t\treg = <0x11600000 0x1000>;\n",
"-\t\t\tinterrupts = <0 79 0>;\n",
@@ -99,23 +86,23 @@
" \t\t\t};\n",
" \t\t};\n",
" \n",
- " \t\tpinctrl_1: pinctrl\@12290000 {\n",
+ " \t\tpinctrl_1: pinctrl at 12290000 {\n",
" \t\t\tcompatible = \"samsung,exynos5260-pinctrl\";\n",
" \t\t\treg = <0x12290000 0x1000>;\n",
"-\t\t\tinterrupts = <0 157 0>;\n",
"+\t\t\tinterrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;\n",
" \t\t};\n",
" \n",
- " \t\tpinctrl_2: pinctrl\@128B0000 {\n",
+ " \t\tpinctrl_2: pinctrl at 128B0000 {\n",
" \t\t\tcompatible = \"samsung,exynos5260-pinctrl\";\n",
" \t\t\treg = <0x128B0000 0x1000>;\n",
"-\t\t\tinterrupts = <0 243 0>;\n",
"+\t\t\tinterrupts = <0 243 IRQ_TYPE_LEVEL_HIGH>;\n",
" \t\t};\n",
" \n",
- " \t\tpmu_system_controller: system-controller\@10D50000 {\n",
+ " \t\tpmu_system_controller: system-controller at 10D50000 {\n",
"\@\@ -239,7 +248,7 \@\@\n",
- " \t\tuart0: serial\@12C00000 {\n",
+ " \t\tuart0: serial at 12C00000 {\n",
" \t\t\tcompatible = \"samsung,exynos4210-uart\";\n",
" \t\t\treg = <0x12C00000 0x100>;\n",
"-\t\t\tinterrupts = <0 146 0>;\n",
@@ -124,7 +111,7 @@
" \t\t\tclock-names = \"uart\", \"clk_uart_baud0\";\n",
" \t\t\tstatus = \"disabled\";\n",
"\@\@ -248,7 +257,7 \@\@\n",
- " \t\tuart1: serial\@12C10000 {\n",
+ " \t\tuart1: serial at 12C10000 {\n",
" \t\t\tcompatible = \"samsung,exynos4210-uart\";\n",
" \t\t\treg = <0x12C10000 0x100>;\n",
"-\t\t\tinterrupts = <0 147 0>;\n",
@@ -133,7 +120,7 @@
" \t\t\tclock-names = \"uart\", \"clk_uart_baud0\";\n",
" \t\t\tstatus = \"disabled\";\n",
"\@\@ -257,7 +266,7 \@\@\n",
- " \t\tuart2: serial\@12C20000 {\n",
+ " \t\tuart2: serial at 12C20000 {\n",
" \t\t\tcompatible = \"samsung,exynos4210-uart\";\n",
" \t\t\treg = <0x12C20000 0x100>;\n",
"-\t\t\tinterrupts = <0 148 0>;\n",
@@ -142,7 +129,7 @@
" \t\t\tclock-names = \"uart\", \"clk_uart_baud0\";\n",
" \t\t\tstatus = \"disabled\";\n",
"\@\@ -266,7 +275,7 \@\@\n",
- " \t\tuart3: serial\@12860000 {\n",
+ " \t\tuart3: serial at 12860000 {\n",
" \t\t\tcompatible = \"samsung,exynos4210-uart\";\n",
" \t\t\treg = <0x12860000 0x100>;\n",
"-\t\t\tinterrupts = <0 145 0>;\n",
@@ -151,7 +138,7 @@
" \t\t\tclock-names = \"uart\", \"clk_uart_baud0\";\n",
" \t\t\tstatus = \"disabled\";\n",
"\@\@ -275,7 +284,7 \@\@\n",
- " \t\tmmc_0: mmc\@12140000 {\n",
+ " \t\tmmc_0: mmc at 12140000 {\n",
" \t\t\tcompatible = \"samsung,exynos5250-dw-mshc\";\n",
" \t\t\treg = <0x12140000 0x2000>;\n",
"-\t\t\tinterrupts = <0 156 0>;\n",
@@ -160,7 +147,7 @@
" \t\t\t#size-cells = <0>;\n",
" \t\t\tclocks = <&clock_fsys FSYS_CLK_MMC0>, <&clock_top TOP_SCLK_MMC0>;\n",
"\@\@ -287,7 +296,7 \@\@\n",
- " \t\tmmc_1: mmc\@12150000 {\n",
+ " \t\tmmc_1: mmc at 12150000 {\n",
" \t\t\tcompatible = \"samsung,exynos5250-dw-mshc\";\n",
" \t\t\treg = <0x12150000 0x2000>;\n",
"-\t\t\tinterrupts = <0 158 0>;\n",
@@ -169,7 +156,7 @@
" \t\t\t#size-cells = <0>;\n",
" \t\t\tclocks = <&clock_fsys FSYS_CLK_MMC1>, <&clock_top TOP_SCLK_MMC1>;\n",
"\@\@ -299,7 +308,7 \@\@\n",
- " \t\tmmc_2: mmc\@12160000 {\n",
+ " \t\tmmc_2: mmc at 12160000 {\n",
" \t\t\tcompatible = \"samsung,exynos5250-dw-mshc\";\n",
" \t\t\treg = <0x12160000 0x2000>;\n",
"-\t\t\tinterrupts = <0 159 0>;\n",
@@ -181,4 +168,4 @@
"2.7.4"
]
-429a14d22bdd9ca4b53312288e792ea348b1ea9f5a2cb7377da5b06b96e31be6
+07f467bb384c996f226103147e35eb5865eeb056bf3535db605a968e50153a1a
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.