All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <1507160237.5452.36.camel@aj.id.au>

diff --git a/a/1.txt b/N1/1.txt
index 1b40c02..899df94 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,11 +6,11 @@ On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:
 Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 
 > ---
->  arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------
+> ?arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------
 > -
->  arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++--------
+> ?arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++--------
 > ------------
->  2 files changed, 54 insertions(+), 55 deletions(-)
+> ?2 files changed, 54 insertions(+), 55 deletions(-)
 > 
 > diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi
 > b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -18,9 +18,9 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > --- a/arch/arm/boot/dts/aspeed-g4.dtsi
 > +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
 > @@ -183,6 +183,27 @@
->  				clock-names = "PCLK";
->  			};
->  
+> ?				clock-names = "PCLK";
+> ?			};
+> ?
 > +			uart1: serial at 1e783000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e783000 0x1000>;
@@ -42,28 +42,28 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
->  			wdt1: wdt at 1e785000 {
->  				compatible = "aspeed,ast2400-wdt";
->  				reg = <0x1e785000 0x1c>;
+> ?			wdt1: wdt at 1e785000 {
+> ?				compatible = "aspeed,ast2400-wdt";
+> ?				reg = <0x1e785000 0x1c>;
 > @@ -197,11 +218,11 @@
->  				status = "disabled";
->  			};
->  
+> ?				status = "disabled";
+> ?			};
+> ?
 > -			uart1: serial at 1e783000 {
 > +			uart6: serial at 1e787000 {
->  				compatible = "ns16550a";
+> ?				compatible = "ns16550a";
 > -				reg = <0x1e783000 0x1000>;
 > +				reg = <0x1e787000 0x1000>;
->  				reg-shift = <2>;
+> ?				reg-shift = <2>;
 > -				interrupts = <9>;
 > +				interrupts = <10>;
->  				clocks = <&clk_uart>;
->  				no-loopback-test;
->  				status = "disabled";
+> ?				clocks = <&clk_uart>;
+> ?				no-loopback-test;
+> ?				status = "disabled";
 > @@ -237,27 +258,6 @@
->  				status = "disabled";
->  			};
->  
+> ?				status = "disabled";
+> ?			};
+> ?
 > -			uart5: serial at 1e784000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e784000 0x1000>;
@@ -85,18 +85,18 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			i2c: i2c at 1e78a000 {
->  				compatible = "simple-bus";
->  				#address-cells = <1>;
+> ?			i2c: i2c at 1e78a000 {
+> ?				compatible = "simple-bus";
+> ?				#address-cells = <1>;
 > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi
 > b/arch/arm/boot/dts/aspeed-g5.dtsi
 > index de2dafa71651..61cc2d25143a 100644
 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi
 > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
 > @@ -227,6 +227,26 @@
->  				clock-names = "PCLK";
->  			};
->  
+> ?				clock-names = "PCLK";
+> ?			};
+> ?
 > +			uart1: serial at 1e783000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e783000 0x1000>;
@@ -117,13 +117,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				no-loopback-test;
 > +				status = "disabled";
 > +			};
->  
->  			wdt1: wdt at 1e785000 {
->  				compatible = "aspeed,ast2500-wdt";
+> ?
+> ?			wdt1: wdt at 1e785000 {
+> ?				compatible = "aspeed,ast2500-wdt";
 > @@ -247,16 +267,6 @@
->  				status = "disabled";
->  			};
->  
+> ?				status = "disabled";
+> ?			};
+> ?
 > -			uart1: serial at 1e783000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e783000 0x1000>;
@@ -134,14 +134,14 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			lpc: lpc at 1e789000 {
->  				compatible = "aspeed,ast2500-lpc",
+> ?			lpc: lpc at 1e789000 {
+> ?				compatible = "aspeed,ast2500-lpc",
 > "simple-mfd";
->  				reg = <0x1e789000 0x1000>;
+> ?				reg = <0x1e789000 0x1000>;
 > @@ -287,6 +297,16 @@
->  				};
->  			};
->  
+> ?				};
+> ?			};
+> ?
 > +			uart6: serial at 1e787000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e787000 0x1000>;
@@ -152,13 +152,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
->  			uart2: serial at 1e78d000 {
->  				compatible = "ns16550a";
->  				reg = <0x1e78d000 0x1000>;
+> ?			uart2: serial at 1e78d000 {
+> ?				compatible = "ns16550a";
+> ?				reg = <0x1e78d000 0x1000>;
 > @@ -317,27 +337,6 @@
->  				status = "disabled";
->  			};
->  
+> ?				status = "disabled";
+> ?			};
+> ?
 > -			uart5: serial at 1e784000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e784000 0x1000>;
@@ -180,13 +180,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			i2c: i2c at 1e78a000 {
->  				compatible = "simple-bus";
->  				#address-cells = <1>;
+> ?			i2c: i2c at 1e78a000 {
+> ?				compatible = "simple-bus";
+> ?				#address-cells = <1>;
 -------------- next part --------------
 A non-text attachment was scrubbed...
 Name: signature.asc
 Type: application/pgp-signature
 Size: 801 bytes
 Desc: This is a digitally signed message part
-URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/a288ad9d/attachment.sig>
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171005/a288ad9d/attachment-0001.sig>
diff --git a/a/content_digest b/N1/content_digest
index 5c2a596..695a904 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,9 @@
  "ref\020171004064917.2498-1-joel@jms.id.au\0"
  "ref\020171004064917.2498-9-joel@jms.id.au\0"
- "From\0Andrew Jeffery <andrew@aj.id.au>\0"
+ "From\0andrew@aj.id.au (Andrew Jeffery)\0"
  "Subject\0[PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0"
  "Date\0Thu, 05 Oct 2017 10:07:17 +1030\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:\n"
@@ -14,11 +14,11 @@
  "Reviewed-by: Andrew Jeffery <andrew@aj.id.au>\n"
  "\n"
  "> ---\n"
- "> \302\240arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------\n"
+ "> ?arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------\n"
  "> -\n"
- "> \302\240arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++--------\n"
+ "> ?arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++--------\n"
  "> ------------\n"
- "> \302\2402 files changed, 54 insertions(+), 55 deletions(-)\n"
+ "> ?2 files changed, 54 insertions(+), 55 deletions(-)\n"
  "> \n"
  "> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi\n"
  "> b/arch/arm/boot/dts/aspeed-g4.dtsi\n"
@@ -26,9 +26,9 @@
  "> --- a/arch/arm/boot/dts/aspeed-g4.dtsi\n"
  "> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi\n"
  "> @@ -183,6 +183,27 @@\n"
- "> \302\240\t\t\t\tclock-names = \"PCLK\";\n"
- "> \302\240\t\t\t};\n"
- "> \302\240\n"
+ "> ?\t\t\t\tclock-names = \"PCLK\";\n"
+ "> ?\t\t\t};\n"
+ "> ?\n"
  "> +\t\t\tuart1: serial at 1e783000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e783000 0x1000>;\n"
@@ -50,28 +50,28 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> \302\240\t\t\twdt1: wdt at 1e785000 {\n"
- "> \302\240\t\t\t\tcompatible = \"aspeed,ast2400-wdt\";\n"
- "> \302\240\t\t\t\treg = <0x1e785000 0x1c>;\n"
+ "> ?\t\t\twdt1: wdt at 1e785000 {\n"
+ "> ?\t\t\t\tcompatible = \"aspeed,ast2400-wdt\";\n"
+ "> ?\t\t\t\treg = <0x1e785000 0x1c>;\n"
  "> @@ -197,11 +218,11 @@\n"
- "> \302\240\t\t\t\tstatus = \"disabled\";\n"
- "> \302\240\t\t\t};\n"
- "> \302\240\n"
+ "> ?\t\t\t\tstatus = \"disabled\";\n"
+ "> ?\t\t\t};\n"
+ "> ?\n"
  "> -\t\t\tuart1: serial at 1e783000 {\n"
  "> +\t\t\tuart6: serial at 1e787000 {\n"
- "> \302\240\t\t\t\tcompatible = \"ns16550a\";\n"
+ "> ?\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> +\t\t\t\treg = <0x1e787000 0x1000>;\n"
- "> \302\240\t\t\t\treg-shift = <2>;\n"
+ "> ?\t\t\t\treg-shift = <2>;\n"
  "> -\t\t\t\tinterrupts = <9>;\n"
  "> +\t\t\t\tinterrupts = <10>;\n"
- "> \302\240\t\t\t\tclocks = <&clk_uart>;\n"
- "> \302\240\t\t\t\tno-loopback-test;\n"
- "> \302\240\t\t\t\tstatus = \"disabled\";\n"
+ "> ?\t\t\t\tclocks = <&clk_uart>;\n"
+ "> ?\t\t\t\tno-loopback-test;\n"
+ "> ?\t\t\t\tstatus = \"disabled\";\n"
  "> @@ -237,27 +258,6 @@\n"
- "> \302\240\t\t\t\tstatus = \"disabled\";\n"
- "> \302\240\t\t\t};\n"
- "> \302\240\n"
+ "> ?\t\t\t\tstatus = \"disabled\";\n"
+ "> ?\t\t\t};\n"
+ "> ?\n"
  "> -\t\t\tuart5: serial at 1e784000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e784000 0x1000>;\n"
@@ -93,18 +93,18 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\ti2c: i2c at 1e78a000 {\n"
- "> \302\240\t\t\t\tcompatible = \"simple-bus\";\n"
- "> \302\240\t\t\t\t#address-cells = <1>;\n"
+ "> ?\t\t\ti2c: i2c at 1e78a000 {\n"
+ "> ?\t\t\t\tcompatible = \"simple-bus\";\n"
+ "> ?\t\t\t\t#address-cells = <1>;\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi\n"
  "> b/arch/arm/boot/dts/aspeed-g5.dtsi\n"
  "> index de2dafa71651..61cc2d25143a 100644\n"
  "> --- a/arch/arm/boot/dts/aspeed-g5.dtsi\n"
  "> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi\n"
  "> @@ -227,6 +227,26 @@\n"
- "> \302\240\t\t\t\tclock-names = \"PCLK\";\n"
- "> \302\240\t\t\t};\n"
- "> \302\240\n"
+ "> ?\t\t\t\tclock-names = \"PCLK\";\n"
+ "> ?\t\t\t};\n"
+ "> ?\n"
  "> +\t\t\tuart1: serial at 1e783000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e783000 0x1000>;\n"
@@ -125,13 +125,13 @@
  "> +\t\t\t\tno-loopback-test;\n"
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
- "> \302\240\n"
- "> \302\240\t\t\twdt1: wdt at 1e785000 {\n"
- "> \302\240\t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n"
+ "> ?\n"
+ "> ?\t\t\twdt1: wdt at 1e785000 {\n"
+ "> ?\t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n"
  "> @@ -247,16 +267,6 @@\n"
- "> \302\240\t\t\t\tstatus = \"disabled\";\n"
- "> \302\240\t\t\t};\n"
- "> \302\240\n"
+ "> ?\t\t\t\tstatus = \"disabled\";\n"
+ "> ?\t\t\t};\n"
+ "> ?\n"
  "> -\t\t\tuart1: serial at 1e783000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e783000 0x1000>;\n"
@@ -142,14 +142,14 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\tlpc: lpc at 1e789000 {\n"
- "> \302\240\t\t\t\tcompatible = \"aspeed,ast2500-lpc\",\n"
+ "> ?\t\t\tlpc: lpc at 1e789000 {\n"
+ "> ?\t\t\t\tcompatible = \"aspeed,ast2500-lpc\",\n"
  "> \"simple-mfd\";\n"
- "> \302\240\t\t\t\treg = <0x1e789000 0x1000>;\n"
+ "> ?\t\t\t\treg = <0x1e789000 0x1000>;\n"
  "> @@ -287,6 +297,16 @@\n"
- "> \302\240\t\t\t\t};\n"
- "> \302\240\t\t\t};\n"
- "> \302\240\n"
+ "> ?\t\t\t\t};\n"
+ "> ?\t\t\t};\n"
+ "> ?\n"
  "> +\t\t\tuart6: serial at 1e787000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e787000 0x1000>;\n"
@@ -160,13 +160,13 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> \302\240\t\t\tuart2: serial at 1e78d000 {\n"
- "> \302\240\t\t\t\tcompatible = \"ns16550a\";\n"
- "> \302\240\t\t\t\treg = <0x1e78d000 0x1000>;\n"
+ "> ?\t\t\tuart2: serial at 1e78d000 {\n"
+ "> ?\t\t\t\tcompatible = \"ns16550a\";\n"
+ "> ?\t\t\t\treg = <0x1e78d000 0x1000>;\n"
  "> @@ -317,27 +337,6 @@\n"
- "> \302\240\t\t\t\tstatus = \"disabled\";\n"
- "> \302\240\t\t\t};\n"
- "> \302\240\n"
+ "> ?\t\t\t\tstatus = \"disabled\";\n"
+ "> ?\t\t\t};\n"
+ "> ?\n"
  "> -\t\t\tuart5: serial at 1e784000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e784000 0x1000>;\n"
@@ -188,15 +188,15 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\ti2c: i2c at 1e78a000 {\n"
- "> \302\240\t\t\t\tcompatible = \"simple-bus\";\n"
- "> \302\240\t\t\t\t#address-cells = <1>;\n"
+ "> ?\t\t\ti2c: i2c at 1e78a000 {\n"
+ "> ?\t\t\t\tcompatible = \"simple-bus\";\n"
+ "> ?\t\t\t\t#address-cells = <1>;\n"
  "-------------- next part --------------\n"
  "A non-text attachment was scrubbed...\n"
  "Name: signature.asc\n"
  "Type: application/pgp-signature\n"
  "Size: 801 bytes\n"
  "Desc: This is a digitally signed message part\n"
- URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/a288ad9d/attachment.sig>
+ URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171005/a288ad9d/attachment-0001.sig>
 
-dc323a94f3a90374c0b74f00e5f25634cd96a9d375afc5c447f178b5288e4fa7
+5581397465566c4f2fc9e5624927e0aaff1c045d75616c9918486fee60717f54

diff --git a/a/1.txt b/N2/1.txt
index 1b40c02..1a876bb 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,9 +1,9 @@
 On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:
 > Order them all by address.
 > 
-> Signed-off-by: Joel Stanley <joel@jms.id.au>
+> Signed-off-by: Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>
 
-Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
+Reviewed-by: Andrew Jeffery <andrew-zrmu5oMJ5Fs@public.gmane.org>
 
 > ---
 >  arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------
@@ -21,7 +21,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				clock-names = "PCLK";
 >  			};
 >  
-> +			uart1: serial at 1e783000 {
+> +			uart1: serial@1e783000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e783000 0x1000>;
 > +				reg-shift = <2>;
@@ -31,7 +31,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
-> +			uart5: serial at 1e784000 {
+> +			uart5: serial@1e784000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e784000 0x1000>;
 > +				reg-shift = <2>;
@@ -42,15 +42,15 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
->  			wdt1: wdt at 1e785000 {
+>  			wdt1: wdt@1e785000 {
 >  				compatible = "aspeed,ast2400-wdt";
 >  				reg = <0x1e785000 0x1c>;
 > @@ -197,11 +218,11 @@
 >  				status = "disabled";
 >  			};
 >  
-> -			uart1: serial at 1e783000 {
-> +			uart6: serial at 1e787000 {
+> -			uart1: serial@1e783000 {
+> +			uart6: serial@1e787000 {
 >  				compatible = "ns16550a";
 > -				reg = <0x1e783000 0x1000>;
 > +				reg = <0x1e787000 0x1000>;
@@ -64,7 +64,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				status = "disabled";
 >  			};
 >  
-> -			uart5: serial at 1e784000 {
+> -			uart5: serial@1e784000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e784000 0x1000>;
 > -				reg-shift = <2>;
@@ -75,7 +75,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
-> -			uart6: serial at 1e787000 {
+> -			uart6: serial@1e787000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e787000 0x1000>;
 > -				reg-shift = <2>;
@@ -85,7 +85,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			i2c: i2c at 1e78a000 {
+>  			i2c: i2c@1e78a000 {
 >  				compatible = "simple-bus";
 >  				#address-cells = <1>;
 > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -97,7 +97,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				clock-names = "PCLK";
 >  			};
 >  
-> +			uart1: serial at 1e783000 {
+> +			uart1: serial@1e783000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e783000 0x1000>;
 > +				reg-shift = <2>;
@@ -107,7 +107,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
-> +			uart5: serial at 1e784000 {
+> +			uart5: serial@1e784000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e784000 0x1000>;
 > +				reg-shift = <2>;
@@ -118,13 +118,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 >  
->  			wdt1: wdt at 1e785000 {
+>  			wdt1: wdt@1e785000 {
 >  				compatible = "aspeed,ast2500-wdt";
 > @@ -247,16 +267,6 @@
 >  				status = "disabled";
 >  			};
 >  
-> -			uart1: serial at 1e783000 {
+> -			uart1: serial@1e783000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e783000 0x1000>;
 > -				reg-shift = <2>;
@@ -134,7 +134,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			lpc: lpc at 1e789000 {
+>  			lpc: lpc@1e789000 {
 >  				compatible = "aspeed,ast2500-lpc",
 > "simple-mfd";
 >  				reg = <0x1e789000 0x1000>;
@@ -142,7 +142,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				};
 >  			};
 >  
-> +			uart6: serial at 1e787000 {
+> +			uart6: serial@1e787000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e787000 0x1000>;
 > +				reg-shift = <2>;
@@ -152,14 +152,14 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
->  			uart2: serial at 1e78d000 {
+>  			uart2: serial@1e78d000 {
 >  				compatible = "ns16550a";
 >  				reg = <0x1e78d000 0x1000>;
 > @@ -317,27 +337,6 @@
 >  				status = "disabled";
 >  			};
 >  
-> -			uart5: serial at 1e784000 {
+> -			uart5: serial@1e784000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e784000 0x1000>;
 > -				reg-shift = <2>;
@@ -170,7 +170,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
-> -			uart6: serial at 1e787000 {
+> -			uart6: serial@1e787000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e787000 0x1000>;
 > -				reg-shift = <2>;
@@ -180,13 +180,6 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			i2c: i2c at 1e78a000 {
+>  			i2c: i2c@1e78a000 {
 >  				compatible = "simple-bus";
 >  				#address-cells = <1>;
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: signature.asc
-Type: application/pgp-signature
-Size: 801 bytes
-Desc: This is a digitally signed message part
-URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/a288ad9d/attachment.sig>
diff --git a/N2/2.bin b/N2/2.bin
new file mode 100644
index 0000000..7e9fa29
--- /dev/null
+++ b/N2/2.bin
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJZ1XCtAAoJEJ0dnzgO5LT58UQP/RR+iylzTbZtarl+xuzNsB91
+u7GmgFUmXmpAjY9HSgiZQH2eGX6Aw2YoYAMC65m07xErrPAkGAY+HqkJAB2WFl2D
+wpqiwz9u6JUNi+G4CLldjVtR03XFTulBDxcnO3CRgYJJtW8NmP0QoEoIMRM9ooAc
+YDgpxOGf80VwwcjJYME8NpBdEVlkNfJ/XVph7zbA4kJmZa4r9JiXevWn2ksBj5nt
+ZkDIvj2H7EQ2CHyD2vjeviq63nPTaCnl8ghxeDIIu/D2wUC2/dMPj5YCsA5l/7Dj
+p5wKQQ3SGGVGm9TZl+2vVeN02JGvED7YBdQytW0AFenqX5B+vAhaSZHhbtxHMTHT
+5qD19Qd9G2fLZjBG6PPVGjblh2ky2KSMjepAtpj+5QUfhDxMrQf28biZlaGxy+jI
+HKcgNGHaSzn8Lw+wBYjII1NuDJdFMNIUmai9xGLQk3o1z7TSCRaZB0XnP0FEozJ+
+ey4MOjuTMkQnIQ+Ni7M1cECOY5jYfR6n7V6JRAsVGvCf5CCThxVdwSxnc8Yw1Fq3
+kNdyq4WnYwsosSoTPEgVs7oMOIV+PHOXW5X3fNyb06sVBbieQYGuXZysUfVf51U1
+PhlEIcSPNEFrAHu2y0zpOPrDeUY1rcy/1xkh8kiR4ygQiXdCEZB4rW/vIto6X4YN
+y20+jf9U8ZIunB/SX+EI
+=nb/z
+-----END PGP SIGNATURE-----
diff --git a/N2/2.hdr b/N2/2.hdr
new file mode 100644
index 0000000..da6d245
--- /dev/null
+++ b/N2/2.hdr
@@ -0,0 +1,3 @@
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: This is a digitally signed message part
+Content-Transfer-Encoding: 7bit
diff --git a/a/content_digest b/N2/content_digest
index 5c2a596..959d877 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,17 +1,28 @@
  "ref\020171004064917.2498-1-joel@jms.id.au\0"
  "ref\020171004064917.2498-9-joel@jms.id.au\0"
- "From\0Andrew Jeffery <andrew@aj.id.au>\0"
- "Subject\0[PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0"
+ "ref\020171004064917.2498-9-joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org\0"
+ "From\0Andrew Jeffery <andrew-zrmu5oMJ5Fs@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0"
  "Date\0Thu, 05 Oct 2017 10:07:17 +1030\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
- "\00:1\0"
+ "To\0Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>"
+  Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
+ " Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>\0"
+ "Cc\0Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>"
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  Rick Altherr <raltherr-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
+  Brendan Higgins <brendanhiggins-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
+ " C\303\251dric Le Goater <clg-Bxea+6Xhats@public.gmane.org>"
+ " linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0"
+ "\01:1\0"
  "b\0"
  "On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:\n"
  "> Order them all by address.\n"
  "> \n"
- "> Signed-off-by: Joel Stanley <joel@jms.id.au>\n"
+ "> Signed-off-by: Joel Stanley <joel-U3u1mxZcP9KHXe+LvDLADg@public.gmane.org>\n"
  "\n"
- "Reviewed-by: Andrew Jeffery <andrew@aj.id.au>\n"
+ "Reviewed-by: Andrew Jeffery <andrew-zrmu5oMJ5Fs@public.gmane.org>\n"
  "\n"
  "> ---\n"
  "> \302\240arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------\n"
@@ -29,7 +40,7 @@
  "> \302\240\t\t\t\tclock-names = \"PCLK\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> +\t\t\tuart1: serial at 1e783000 {\n"
+ "> +\t\t\tuart1: serial@1e783000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -39,7 +50,7 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tuart5: serial at 1e784000 {\n"
+ "> +\t\t\tuart5: serial@1e784000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -50,15 +61,15 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> \302\240\t\t\twdt1: wdt at 1e785000 {\n"
+ "> \302\240\t\t\twdt1: wdt@1e785000 {\n"
  "> \302\240\t\t\t\tcompatible = \"aspeed,ast2400-wdt\";\n"
  "> \302\240\t\t\t\treg = <0x1e785000 0x1c>;\n"
  "> @@ -197,11 +218,11 @@\n"
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart1: serial at 1e783000 {\n"
- "> +\t\t\tuart6: serial at 1e787000 {\n"
+ "> -\t\t\tuart1: serial@1e783000 {\n"
+ "> +\t\t\tuart6: serial@1e787000 {\n"
  "> \302\240\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> +\t\t\t\treg = <0x1e787000 0x1000>;\n"
@@ -72,7 +83,7 @@
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart5: serial at 1e784000 {\n"
+ "> -\t\t\tuart5: serial@1e784000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -83,7 +94,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> -\t\t\tuart6: serial at 1e787000 {\n"
+ "> -\t\t\tuart6: serial@1e787000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e787000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -93,7 +104,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\ti2c: i2c at 1e78a000 {\n"
+ "> \302\240\t\t\ti2c: i2c@1e78a000 {\n"
  "> \302\240\t\t\t\tcompatible = \"simple-bus\";\n"
  "> \302\240\t\t\t\t#address-cells = <1>;\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi\n"
@@ -105,7 +116,7 @@
  "> \302\240\t\t\t\tclock-names = \"PCLK\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> +\t\t\tuart1: serial at 1e783000 {\n"
+ "> +\t\t\tuart1: serial@1e783000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -115,7 +126,7 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tuart5: serial at 1e784000 {\n"
+ "> +\t\t\tuart5: serial@1e784000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -126,13 +137,13 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> \302\240\n"
- "> \302\240\t\t\twdt1: wdt at 1e785000 {\n"
+ "> \302\240\t\t\twdt1: wdt@1e785000 {\n"
  "> \302\240\t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n"
  "> @@ -247,16 +267,6 @@\n"
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart1: serial at 1e783000 {\n"
+ "> -\t\t\tuart1: serial@1e783000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -142,7 +153,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\tlpc: lpc at 1e789000 {\n"
+ "> \302\240\t\t\tlpc: lpc@1e789000 {\n"
  "> \302\240\t\t\t\tcompatible = \"aspeed,ast2500-lpc\",\n"
  "> \"simple-mfd\";\n"
  "> \302\240\t\t\t\treg = <0x1e789000 0x1000>;\n"
@@ -150,7 +161,7 @@
  "> \302\240\t\t\t\t};\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> +\t\t\tuart6: serial at 1e787000 {\n"
+ "> +\t\t\tuart6: serial@1e787000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e787000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -160,14 +171,14 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> \302\240\t\t\tuart2: serial at 1e78d000 {\n"
+ "> \302\240\t\t\tuart2: serial@1e78d000 {\n"
  "> \302\240\t\t\t\tcompatible = \"ns16550a\";\n"
  "> \302\240\t\t\t\treg = <0x1e78d000 0x1000>;\n"
  "> @@ -317,27 +337,6 @@\n"
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart5: serial at 1e784000 {\n"
+ "> -\t\t\tuart5: serial@1e784000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -178,7 +189,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> -\t\t\tuart6: serial at 1e787000 {\n"
+ "> -\t\t\tuart6: serial@1e787000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e787000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -188,15 +199,28 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\ti2c: i2c at 1e78a000 {\n"
+ "> \302\240\t\t\ti2c: i2c@1e78a000 {\n"
  "> \302\240\t\t\t\tcompatible = \"simple-bus\";\n"
- "> \302\240\t\t\t\t#address-cells = <1>;\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: signature.asc\n"
- "Type: application/pgp-signature\n"
- "Size: 801 bytes\n"
- "Desc: This is a digitally signed message part\n"
- URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/a288ad9d/attachment.sig>
+ "> \302\240\t\t\t\t#address-cells = <1>;"
+ "\01:2\0"
+ "fn\0signature.asc\0"
+ "d\0This is a digitally signed message part\0"
+ "b\0"
+ "-----BEGIN PGP SIGNATURE-----\n"
+ "\n"
+ "iQIcBAABCgAGBQJZ1XCtAAoJEJ0dnzgO5LT58UQP/RR+iylzTbZtarl+xuzNsB91\n"
+ "u7GmgFUmXmpAjY9HSgiZQH2eGX6Aw2YoYAMC65m07xErrPAkGAY+HqkJAB2WFl2D\n"
+ "wpqiwz9u6JUNi+G4CLldjVtR03XFTulBDxcnO3CRgYJJtW8NmP0QoEoIMRM9ooAc\n"
+ "YDgpxOGf80VwwcjJYME8NpBdEVlkNfJ/XVph7zbA4kJmZa4r9JiXevWn2ksBj5nt\n"
+ "ZkDIvj2H7EQ2CHyD2vjeviq63nPTaCnl8ghxeDIIu/D2wUC2/dMPj5YCsA5l/7Dj\n"
+ "p5wKQQ3SGGVGm9TZl+2vVeN02JGvED7YBdQytW0AFenqX5B+vAhaSZHhbtxHMTHT\n"
+ "5qD19Qd9G2fLZjBG6PPVGjblh2ky2KSMjepAtpj+5QUfhDxMrQf28biZlaGxy+jI\n"
+ "HKcgNGHaSzn8Lw+wBYjII1NuDJdFMNIUmai9xGLQk3o1z7TSCRaZB0XnP0FEozJ+\n"
+ "ey4MOjuTMkQnIQ+Ni7M1cECOY5jYfR6n7V6JRAsVGvCf5CCThxVdwSxnc8Yw1Fq3\n"
+ "kNdyq4WnYwsosSoTPEgVs7oMOIV+PHOXW5X3fNyb06sVBbieQYGuXZysUfVf51U1\n"
+ "PhlEIcSPNEFrAHu2y0zpOPrDeUY1rcy/1xkh8kiR4ygQiXdCEZB4rW/vIto6X4YN\n"
+ "y20+jf9U8ZIunB/SX+EI\n"
+ "=nb/z\n"
+ "-----END PGP SIGNATURE-----\n"
 
-dc323a94f3a90374c0b74f00e5f25634cd96a9d375afc5c447f178b5288e4fa7
+f48eb3e1f53308e58430455baa58f82f08a0d8f4adb070f5654bd71672745a87

diff --git a/a/1.txt b/N3/1.txt
index 1b40c02..d1520fa 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -21,7 +21,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				clock-names = "PCLK";
 >  			};
 >  
-> +			uart1: serial at 1e783000 {
+> +			uart1: serial@1e783000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e783000 0x1000>;
 > +				reg-shift = <2>;
@@ -31,7 +31,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
-> +			uart5: serial at 1e784000 {
+> +			uart5: serial@1e784000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e784000 0x1000>;
 > +				reg-shift = <2>;
@@ -42,15 +42,15 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
->  			wdt1: wdt at 1e785000 {
+>  			wdt1: wdt@1e785000 {
 >  				compatible = "aspeed,ast2400-wdt";
 >  				reg = <0x1e785000 0x1c>;
 > @@ -197,11 +218,11 @@
 >  				status = "disabled";
 >  			};
 >  
-> -			uart1: serial at 1e783000 {
-> +			uart6: serial at 1e787000 {
+> -			uart1: serial@1e783000 {
+> +			uart6: serial@1e787000 {
 >  				compatible = "ns16550a";
 > -				reg = <0x1e783000 0x1000>;
 > +				reg = <0x1e787000 0x1000>;
@@ -64,7 +64,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				status = "disabled";
 >  			};
 >  
-> -			uart5: serial at 1e784000 {
+> -			uart5: serial@1e784000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e784000 0x1000>;
 > -				reg-shift = <2>;
@@ -75,7 +75,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
-> -			uart6: serial at 1e787000 {
+> -			uart6: serial@1e787000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e787000 0x1000>;
 > -				reg-shift = <2>;
@@ -85,7 +85,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			i2c: i2c at 1e78a000 {
+>  			i2c: i2c@1e78a000 {
 >  				compatible = "simple-bus";
 >  				#address-cells = <1>;
 > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -97,7 +97,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				clock-names = "PCLK";
 >  			};
 >  
-> +			uart1: serial at 1e783000 {
+> +			uart1: serial@1e783000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e783000 0x1000>;
 > +				reg-shift = <2>;
@@ -107,7 +107,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
-> +			uart5: serial at 1e784000 {
+> +			uart5: serial@1e784000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e784000 0x1000>;
 > +				reg-shift = <2>;
@@ -118,13 +118,13 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 >  
->  			wdt1: wdt at 1e785000 {
+>  			wdt1: wdt@1e785000 {
 >  				compatible = "aspeed,ast2500-wdt";
 > @@ -247,16 +267,6 @@
 >  				status = "disabled";
 >  			};
 >  
-> -			uart1: serial at 1e783000 {
+> -			uart1: serial@1e783000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e783000 0x1000>;
 > -				reg-shift = <2>;
@@ -134,7 +134,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			lpc: lpc at 1e789000 {
+>  			lpc: lpc@1e789000 {
 >  				compatible = "aspeed,ast2500-lpc",
 > "simple-mfd";
 >  				reg = <0x1e789000 0x1000>;
@@ -142,7 +142,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 >  				};
 >  			};
 >  
-> +			uart6: serial at 1e787000 {
+> +			uart6: serial@1e787000 {
 > +				compatible = "ns16550a";
 > +				reg = <0x1e787000 0x1000>;
 > +				reg-shift = <2>;
@@ -152,14 +152,14 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > +				status = "disabled";
 > +			};
 > +
->  			uart2: serial at 1e78d000 {
+>  			uart2: serial@1e78d000 {
 >  				compatible = "ns16550a";
 >  				reg = <0x1e78d000 0x1000>;
 > @@ -317,27 +337,6 @@
 >  				status = "disabled";
 >  			};
 >  
-> -			uart5: serial at 1e784000 {
+> -			uart5: serial@1e784000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e784000 0x1000>;
 > -				reg-shift = <2>;
@@ -170,7 +170,7 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
-> -			uart6: serial at 1e787000 {
+> -			uart6: serial@1e787000 {
 > -				compatible = "ns16550a";
 > -				reg = <0x1e787000 0x1000>;
 > -				reg-shift = <2>;
@@ -180,13 +180,6 @@ Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
 > -				status = "disabled";
 > -			};
 > -
->  			i2c: i2c at 1e78a000 {
+>  			i2c: i2c@1e78a000 {
 >  				compatible = "simple-bus";
 >  				#address-cells = <1>;
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: signature.asc
-Type: application/pgp-signature
-Size: 801 bytes
-Desc: This is a digitally signed message part
-URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/a288ad9d/attachment.sig>
diff --git a/N3/2.bin b/N3/2.bin
new file mode 100644
index 0000000..7e9fa29
--- /dev/null
+++ b/N3/2.bin
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJZ1XCtAAoJEJ0dnzgO5LT58UQP/RR+iylzTbZtarl+xuzNsB91
+u7GmgFUmXmpAjY9HSgiZQH2eGX6Aw2YoYAMC65m07xErrPAkGAY+HqkJAB2WFl2D
+wpqiwz9u6JUNi+G4CLldjVtR03XFTulBDxcnO3CRgYJJtW8NmP0QoEoIMRM9ooAc
+YDgpxOGf80VwwcjJYME8NpBdEVlkNfJ/XVph7zbA4kJmZa4r9JiXevWn2ksBj5nt
+ZkDIvj2H7EQ2CHyD2vjeviq63nPTaCnl8ghxeDIIu/D2wUC2/dMPj5YCsA5l/7Dj
+p5wKQQ3SGGVGm9TZl+2vVeN02JGvED7YBdQytW0AFenqX5B+vAhaSZHhbtxHMTHT
+5qD19Qd9G2fLZjBG6PPVGjblh2ky2KSMjepAtpj+5QUfhDxMrQf28biZlaGxy+jI
+HKcgNGHaSzn8Lw+wBYjII1NuDJdFMNIUmai9xGLQk3o1z7TSCRaZB0XnP0FEozJ+
+ey4MOjuTMkQnIQ+Ni7M1cECOY5jYfR6n7V6JRAsVGvCf5CCThxVdwSxnc8Yw1Fq3
+kNdyq4WnYwsosSoTPEgVs7oMOIV+PHOXW5X3fNyb06sVBbieQYGuXZysUfVf51U1
+PhlEIcSPNEFrAHu2y0zpOPrDeUY1rcy/1xkh8kiR4ygQiXdCEZB4rW/vIto6X4YN
+y20+jf9U8ZIunB/SX+EI
+=nb/z
+-----END PGP SIGNATURE-----
diff --git a/N3/2.hdr b/N3/2.hdr
new file mode 100644
index 0000000..da6d245
--- /dev/null
+++ b/N3/2.hdr
@@ -0,0 +1,3 @@
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: This is a digitally signed message part
+Content-Transfer-Encoding: 7bit
diff --git a/a/content_digest b/N3/content_digest
index 5c2a596..20372ff 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -1,10 +1,20 @@
  "ref\020171004064917.2498-1-joel@jms.id.au\0"
  "ref\020171004064917.2498-9-joel@jms.id.au\0"
  "From\0Andrew Jeffery <andrew@aj.id.au>\0"
- "Subject\0[PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0"
+ "Subject\0Re: [PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes\0"
  "Date\0Thu, 05 Oct 2017 10:07:17 +1030\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
- "\00:1\0"
+ "To\0Joel Stanley <joel@jms.id.au>"
+  Rob Herring <robh+dt@kernel.org>
+ " Mark Rutland <mark.rutland@arm.com>\0"
+ "Cc\0Russell King <linux@armlinux.org.uk>"
+  devicetree@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+  linux-kernel@vger.kernel.org
+  Rick Altherr <raltherr@google.com>
+  Brendan Higgins <brendanhiggins@google.com>
+ " C\303\251dric Le Goater <clg@kaod.org>"
+ " linux-aspeed@lists.ozlabs.org\0"
+ "\01:1\0"
  "b\0"
  "On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:\n"
  "> Order them all by address.\n"
@@ -29,7 +39,7 @@
  "> \302\240\t\t\t\tclock-names = \"PCLK\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> +\t\t\tuart1: serial at 1e783000 {\n"
+ "> +\t\t\tuart1: serial@1e783000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -39,7 +49,7 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tuart5: serial at 1e784000 {\n"
+ "> +\t\t\tuart5: serial@1e784000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -50,15 +60,15 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> \302\240\t\t\twdt1: wdt at 1e785000 {\n"
+ "> \302\240\t\t\twdt1: wdt@1e785000 {\n"
  "> \302\240\t\t\t\tcompatible = \"aspeed,ast2400-wdt\";\n"
  "> \302\240\t\t\t\treg = <0x1e785000 0x1c>;\n"
  "> @@ -197,11 +218,11 @@\n"
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart1: serial at 1e783000 {\n"
- "> +\t\t\tuart6: serial at 1e787000 {\n"
+ "> -\t\t\tuart1: serial@1e783000 {\n"
+ "> +\t\t\tuart6: serial@1e787000 {\n"
  "> \302\240\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> +\t\t\t\treg = <0x1e787000 0x1000>;\n"
@@ -72,7 +82,7 @@
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart5: serial at 1e784000 {\n"
+ "> -\t\t\tuart5: serial@1e784000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -83,7 +93,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> -\t\t\tuart6: serial at 1e787000 {\n"
+ "> -\t\t\tuart6: serial@1e787000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e787000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -93,7 +103,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\ti2c: i2c at 1e78a000 {\n"
+ "> \302\240\t\t\ti2c: i2c@1e78a000 {\n"
  "> \302\240\t\t\t\tcompatible = \"simple-bus\";\n"
  "> \302\240\t\t\t\t#address-cells = <1>;\n"
  "> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi\n"
@@ -105,7 +115,7 @@
  "> \302\240\t\t\t\tclock-names = \"PCLK\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> +\t\t\tuart1: serial at 1e783000 {\n"
+ "> +\t\t\tuart1: serial@1e783000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -115,7 +125,7 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tuart5: serial at 1e784000 {\n"
+ "> +\t\t\tuart5: serial@1e784000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -126,13 +136,13 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> \302\240\n"
- "> \302\240\t\t\twdt1: wdt at 1e785000 {\n"
+ "> \302\240\t\t\twdt1: wdt@1e785000 {\n"
  "> \302\240\t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n"
  "> @@ -247,16 +267,6 @@\n"
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart1: serial at 1e783000 {\n"
+ "> -\t\t\tuart1: serial@1e783000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e783000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -142,7 +152,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\tlpc: lpc at 1e789000 {\n"
+ "> \302\240\t\t\tlpc: lpc@1e789000 {\n"
  "> \302\240\t\t\t\tcompatible = \"aspeed,ast2500-lpc\",\n"
  "> \"simple-mfd\";\n"
  "> \302\240\t\t\t\treg = <0x1e789000 0x1000>;\n"
@@ -150,7 +160,7 @@
  "> \302\240\t\t\t\t};\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> +\t\t\tuart6: serial at 1e787000 {\n"
+ "> +\t\t\tuart6: serial@1e787000 {\n"
  "> +\t\t\t\tcompatible = \"ns16550a\";\n"
  "> +\t\t\t\treg = <0x1e787000 0x1000>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
@@ -160,14 +170,14 @@
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> \302\240\t\t\tuart2: serial at 1e78d000 {\n"
+ "> \302\240\t\t\tuart2: serial@1e78d000 {\n"
  "> \302\240\t\t\t\tcompatible = \"ns16550a\";\n"
  "> \302\240\t\t\t\treg = <0x1e78d000 0x1000>;\n"
  "> @@ -317,27 +337,6 @@\n"
  "> \302\240\t\t\t\tstatus = \"disabled\";\n"
  "> \302\240\t\t\t};\n"
  "> \302\240\n"
- "> -\t\t\tuart5: serial at 1e784000 {\n"
+ "> -\t\t\tuart5: serial@1e784000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e784000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -178,7 +188,7 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> -\t\t\tuart6: serial at 1e787000 {\n"
+ "> -\t\t\tuart6: serial@1e787000 {\n"
  "> -\t\t\t\tcompatible = \"ns16550a\";\n"
  "> -\t\t\t\treg = <0x1e787000 0x1000>;\n"
  "> -\t\t\t\treg-shift = <2>;\n"
@@ -188,15 +198,28 @@
  "> -\t\t\t\tstatus = \"disabled\";\n"
  "> -\t\t\t};\n"
  "> -\n"
- "> \302\240\t\t\ti2c: i2c at 1e78a000 {\n"
+ "> \302\240\t\t\ti2c: i2c@1e78a000 {\n"
  "> \302\240\t\t\t\tcompatible = \"simple-bus\";\n"
- "> \302\240\t\t\t\t#address-cells = <1>;\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: signature.asc\n"
- "Type: application/pgp-signature\n"
- "Size: 801 bytes\n"
- "Desc: This is a digitally signed message part\n"
- URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20171005/a288ad9d/attachment.sig>
+ "> \302\240\t\t\t\t#address-cells = <1>;"
+ "\01:2\0"
+ "fn\0signature.asc\0"
+ "d\0This is a digitally signed message part\0"
+ "b\0"
+ "-----BEGIN PGP SIGNATURE-----\n"
+ "\n"
+ "iQIcBAABCgAGBQJZ1XCtAAoJEJ0dnzgO5LT58UQP/RR+iylzTbZtarl+xuzNsB91\n"
+ "u7GmgFUmXmpAjY9HSgiZQH2eGX6Aw2YoYAMC65m07xErrPAkGAY+HqkJAB2WFl2D\n"
+ "wpqiwz9u6JUNi+G4CLldjVtR03XFTulBDxcnO3CRgYJJtW8NmP0QoEoIMRM9ooAc\n"
+ "YDgpxOGf80VwwcjJYME8NpBdEVlkNfJ/XVph7zbA4kJmZa4r9JiXevWn2ksBj5nt\n"
+ "ZkDIvj2H7EQ2CHyD2vjeviq63nPTaCnl8ghxeDIIu/D2wUC2/dMPj5YCsA5l/7Dj\n"
+ "p5wKQQ3SGGVGm9TZl+2vVeN02JGvED7YBdQytW0AFenqX5B+vAhaSZHhbtxHMTHT\n"
+ "5qD19Qd9G2fLZjBG6PPVGjblh2ky2KSMjepAtpj+5QUfhDxMrQf28biZlaGxy+jI\n"
+ "HKcgNGHaSzn8Lw+wBYjII1NuDJdFMNIUmai9xGLQk3o1z7TSCRaZB0XnP0FEozJ+\n"
+ "ey4MOjuTMkQnIQ+Ni7M1cECOY5jYfR6n7V6JRAsVGvCf5CCThxVdwSxnc8Yw1Fq3\n"
+ "kNdyq4WnYwsosSoTPEgVs7oMOIV+PHOXW5X3fNyb06sVBbieQYGuXZysUfVf51U1\n"
+ "PhlEIcSPNEFrAHu2y0zpOPrDeUY1rcy/1xkh8kiR4ygQiXdCEZB4rW/vIto6X4YN\n"
+ "y20+jf9U8ZIunB/SX+EI\n"
+ "=nb/z\n"
+ "-----END PGP SIGNATURE-----\n"
 
-dc323a94f3a90374c0b74f00e5f25634cd96a9d375afc5c447f178b5288e4fa7
+adde33735bd4864ef16ffbbe5ddb72c5f53820f1a5d98824f5e22f7b9fd920f1

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.