diff for duplicates of <003801ce6756$6578ff80$306afe80$@samsung.com> diff --git a/a/1.txt b/N1/1.txt index fb002ad..6800d6a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Exynos5440 has two PCIe controllers which can be used as root complex for PCIe interface. -Signed-off-by: Jingoo Han <jg1.han@samsung.com> +Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> --- Tested on Exynos5440. diff --git a/a/content_digest b/N1/content_digest index 6755a37..594a81e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,29 +1,25 @@ - "From\0Jingoo Han <jg1.han@samsung.com>\0" + "From\0Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\0" "Subject\0[PATCH V4 3/3] ARM: dts: Add pcie controller node for Samsung EXYNOS5440 SoC\0" "Date\0Wed, 12 Jun 2013 19:20:00 +0900\0" - "To\0'Kukjin Kim' <kgene.kim@samsung.com>" - " 'Bjorn Helgaas' <bhelgaas@google.com>\0" - "Cc\0linux-samsung-soc@vger.kernel.org" - linux-pci@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - 'Grant Likely' <grant.likely@secretlab.ca> - 'Andrew Murray' <andrew.murray@arm.com> - 'Thomas Petazzoni' <thomas.petazzoni@free-electrons.com> - 'Thierry Reding' <thierry.reding@avionic-design.de> - 'Jason Gunthorpe' <jgunthorpe@obsidianresearch.com> - 'Arnd Bergmann' <arnd@arndb.de> - 'Surendranath Gurivireddy Balla' <suren.reddy@samsung.com> - 'Siva Reddy Kallam' <siva.kallam@samsung.com> - 'Thomas Abraham' <thomas.abraham@linaro.org> - " Jingoo Han <jg1.han@samsung.com>\0" + "To\0'Kukjin Kim' <kgene.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>" + " 'Bjorn Helgaas' <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\0" + "Cc\0'Jason Gunthorpe' <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>" + linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + 'Siva Reddy Kallam' <siva.kallam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> + linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + 'Thierry Reding' <thierry.reding-RM9K5IK7kjKj5M59NBduVrNAH6kLmebB@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + 'Surendranath Gurivireddy Balla' <suren.reddy-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> + Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> + 'Andrew Murray' <andrew.murray-5wv7dgnIgG8@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "Exynos5440 has two PCIe controllers which can be used as root complex\n" "for PCIe interface.\n" "\n" - "Signed-off-by: Jingoo Han <jg1.han@samsung.com>\n" + "Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\n" "---\n" "Tested on Exynos5440.\n" "\n" @@ -105,4 +101,4 @@ "-- \n" 1.7.10.4 -2aba2b063a053eb90be7fb2f7053f90e60ff1037ba778ec07aa4a1a9b4bbefc8 +6ebd9deec1eecb5f6b72f2b0c3230a606d91ff9d39d34acbef06869beacc06d5
diff --git a/a/1.txt b/N2/1.txt index fb002ad..a926c98 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,11 +25,11 @@ index d55042b..efe7d39 100644 }; }; + -+ pcie0@40000000 { ++ pcie0 at 40000000 { + reset-gpio = <5>; + }; + -+ pcie1@60000000 { ++ pcie1 at 60000000 { + reset-gpio = <22>; + }; }; @@ -42,7 +42,7 @@ index f6b1c89..2c15f9d 100644 status = "disabled"; }; + -+ pcie0@0x290000 { ++ pcie0 at 0x290000 { + compatible = "samsung,exynos5440-pcie"; + reg = <0x290000 0x1000 + 0x270000 0x1000 @@ -61,7 +61,7 @@ index f6b1c89..2c15f9d 100644 + interrupt-map = <0x0 0 &gic 53>; + }; + -+ pcie1@2a0000 { ++ pcie1 at 2a0000 { + compatible = "samsung,exynos5440-pcie"; + reg = <0x2a0000 0x1000 + 0x272000 0x1000 diff --git a/a/content_digest b/N2/content_digest index 6755a37..49c971d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,7 @@ - "From\0Jingoo Han <jg1.han@samsung.com>\0" + "From\0jg1.han@samsung.com (Jingoo Han)\0" "Subject\0[PATCH V4 3/3] ARM: dts: Add pcie controller node for Samsung EXYNOS5440 SoC\0" "Date\0Wed, 12 Jun 2013 19:20:00 +0900\0" - "To\0'Kukjin Kim' <kgene.kim@samsung.com>" - " 'Bjorn Helgaas' <bhelgaas@google.com>\0" - "Cc\0linux-samsung-soc@vger.kernel.org" - linux-pci@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - 'Grant Likely' <grant.likely@secretlab.ca> - 'Andrew Murray' <andrew.murray@arm.com> - 'Thomas Petazzoni' <thomas.petazzoni@free-electrons.com> - 'Thierry Reding' <thierry.reding@avionic-design.de> - 'Jason Gunthorpe' <jgunthorpe@obsidianresearch.com> - 'Arnd Bergmann' <arnd@arndb.de> - 'Surendranath Gurivireddy Balla' <suren.reddy@samsung.com> - 'Siva Reddy Kallam' <siva.kallam@samsung.com> - 'Thomas Abraham' <thomas.abraham@linaro.org> - " Jingoo Han <jg1.han@samsung.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Exynos5440 has two PCIe controllers which can be used as root complex\n" @@ -47,11 +31,11 @@ " \t\t};\n" " \t};\n" "+\n" - "+\tpcie0@40000000 {\n" + "+\tpcie0 at 40000000 {\n" "+\t\treset-gpio = <5>;\n" "+\t};\n" "+\n" - "+\tpcie1@60000000 {\n" + "+\tpcie1 at 60000000 {\n" "+\t\treset-gpio = <22>;\n" "+\t};\n" " };\n" @@ -64,7 +48,7 @@ " \t\tstatus = \"disabled\";\n" " \t};\n" "+\n" - "+\tpcie0@0x290000 {\n" + "+\tpcie0 at 0x290000 {\n" "+\t\tcompatible = \"samsung,exynos5440-pcie\";\n" "+\t\treg = <0x290000 0x1000\n" "+\t\t\t0x270000 0x1000\n" @@ -83,7 +67,7 @@ "+\t\tinterrupt-map = <0x0 0 &gic 53>;\n" "+\t};\n" "+\n" - "+\tpcie1@2a0000 {\n" + "+\tpcie1 at 2a0000 {\n" "+\t\tcompatible = \"samsung,exynos5440-pcie\";\n" "+\t\treg = <0x2a0000 0x1000\n" "+\t\t\t0x272000 0x1000\n" @@ -105,4 +89,4 @@ "-- \n" 1.7.10.4 -2aba2b063a053eb90be7fb2f7053f90e60ff1037ba778ec07aa4a1a9b4bbefc8 +581bb8ea0fa6304e740c528204973fc0f0d566c646ba673669c6a2f5b0366d8f
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.