diff for duplicates of <1524594959-5259-4-git-send-email-thor.thayer@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 9ef5f20..daf5900 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ index 76d5db4138b0..3a7da19216bb 100644 status = "disabled"; }; -+ eccmgr: eccmgr@ffd12000 { ++ eccmgr: eccmgr at ffd12000 { + compatible = "altr,socfpga-s10-ecc-manager"; + altr,sysmgr-syscon = <&sysmgr>; + #address-cells = <1>; @@ -26,13 +26,15 @@ index 76d5db4138b0..3a7da19216bb 100644 + #interrupt-cells = <2>; + ranges; + -+ sdramedac@f8011100 { ++ sdramedac at f8011100 { + compatible = "altr,sdram-edac-s10"; + reg = <0xf8011100 0xC0>; + interrupts = <16 4>, <48 4>; + }; + }; + - qspi: spi@ff8d2000 { + qspi: spi at ff8d2000 { compatible = "cdns,qspi-nor"; #address-cells = <1>; +-- +2.7.4 diff --git a/a/content_digest b/N1/content_digest index fbc618a..8aea36a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,8 @@ - "From\0thor.thayer@linux.intel.com\0" - "Subject\0[3/3] arm64: dts: stratix10: add sdram ecc\0" + "ref\01524594959-5259-1-git-send-email-thor.thayer@linux.intel.com\0" + "From\0thor.thayer@linux.intel.com (thor.thayer at linux.intel.com)\0" + "Subject\0[PATCH 3/3] arm64: dts: stratix10: add sdram ecc\0" "Date\0Tue, 24 Apr 2018 13:35:59 -0500\0" - "To\0bp@alien8.de" - mchehab@kernel.org - robh+dt@kernel.org - mark.rutland@arm.com - dinguyen@kernel.org - catalin.marinas@arm.com - " will.deacon@arm.com\0" - "Cc\0thor.thayer@linux.intel.com" - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-edac@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Thor Thayer <thor.thayer@linux.intel.com>\n" @@ -32,7 +23,7 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - "+\t\teccmgr: eccmgr@ffd12000 {\n" + "+\t\teccmgr: eccmgr at ffd12000 {\n" "+\t\t\tcompatible = \"altr,socfpga-s10-ecc-manager\";\n" "+\t\t\taltr,sysmgr-syscon = <&sysmgr>;\n" "+\t\t\t#address-cells = <1>;\n" @@ -42,15 +33,17 @@ "+\t\t\t#interrupt-cells = <2>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tsdramedac@f8011100 {\n" + "+\t\t\tsdramedac at f8011100 {\n" "+\t\t\t\tcompatible = \"altr,sdram-edac-s10\";\n" "+\t\t\t\treg = <0xf8011100 0xC0>;\n" "+\t\t\t\tinterrupts = <16 4>, <48 4>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\tqspi: spi@ff8d2000 {\n" + " \t\tqspi: spi at ff8d2000 {\n" " \t\t\tcompatible = \"cdns,qspi-nor\";\n" - " \t\t\t#address-cells = <1>;" + " \t\t\t#address-cells = <1>;\n" + "-- \n" + 2.7.4 -e7e028ad57f4f792756ee8e006fd312edf35f369444e8d76796baab6e6ef93b0 +6fdf13312409c8e147162a761167fd31ce84f6f926fb1f79206615c4c1a6d12f
diff --git a/a/1.txt b/N2/1.txt index 9ef5f20..4868df1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -36,3 +36,5 @@ index 76d5db4138b0..3a7da19216bb 100644 qspi: spi@ff8d2000 { compatible = "cdns,qspi-nor"; #address-cells = <1>; +-- +2.7.4 diff --git a/a/content_digest b/N2/content_digest index fbc618a..fdb9745 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,5 +1,6 @@ + "ref\01524594959-5259-1-git-send-email-thor.thayer@linux.intel.com\0" "From\0thor.thayer@linux.intel.com\0" - "Subject\0[3/3] arm64: dts: stratix10: add sdram ecc\0" + "Subject\0[PATCH 3/3] arm64: dts: stratix10: add sdram ecc\0" "Date\0Tue, 24 Apr 2018 13:35:59 -0500\0" "To\0bp@alien8.de" mchehab@kernel.org @@ -8,8 +9,8 @@ dinguyen@kernel.org catalin.marinas@arm.com " will.deacon@arm.com\0" - "Cc\0thor.thayer@linux.intel.com" - devicetree@vger.kernel.org + "Cc\0devicetree@vger.kernel.org" + thor.thayer@linux.intel.com linux-arm-kernel@lists.infradead.org " linux-edac@vger.kernel.org\0" "\00:1\0" @@ -51,6 +52,8 @@ "+\n" " \t\tqspi: spi@ff8d2000 {\n" " \t\t\tcompatible = \"cdns,qspi-nor\";\n" - " \t\t\t#address-cells = <1>;" + " \t\t\t#address-cells = <1>;\n" + "-- \n" + 2.7.4 -e7e028ad57f4f792756ee8e006fd312edf35f369444e8d76796baab6e6ef93b0 +618aaf9261efb5c3b674c5251ff0632854839e3684492ae223f5ae63d6445d2f
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.