diff for duplicates of <20190128154341.47195-111-sashal@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 763b7de..81d8f47 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ From: Rob Herring <robh@kernel.org>
 
 [ Upstream commit 8ef86955fe59f7912a40d57ae4c6d511f0187b4d ]
 
-The base aspeed-g5.dtsi already defines a '/memory at 80000000' node, so
+The base aspeed-g5.dtsi already defines a '/memory@80000000' node, so
 '/memory' in the board files create a duplicate node. We're probably
 getting lucky that the bootloader fixes up the memory node that the
 kernel ends up using. Add the unit-address so it's merged with the base
@@ -12,9 +12,9 @@ Found with DT json-schema checks.
 
 Cc: Joel Stanley <joel@jms.id.au>
 Cc: Andrew Jeffery <andrew@aj.id.au>
-Cc: devicetree at vger.kernel.org
-Cc: linux-arm-kernel at lists.infradead.org
-Cc: linux-aspeed at lists.ozlabs.org
+Cc: devicetree@vger.kernel.org
+Cc: linux-arm-kernel@lists.infradead.org
+Cc: linux-aspeed@lists.ozlabs.org
 Signed-off-by: Rob Herring <robh@kernel.org>
 Signed-off-by: Olof Johansson <olof@lixom.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
@@ -34,7 +34,7 @@ index df1227613d48..c2ece0b91885 100644
  	};
  
 -	memory {
-+	memory at 80000000 {
++	memory@80000000 {
  		reg = <0x80000000 0x40000000>;
  	};
  
@@ -47,7 +47,7 @@ index 7a291de02543..22dade6393d0 100644
  	};
  
 -	memory {
-+	memory at 80000000 {
++	memory@80000000 {
  		reg = <0x80000000 0x20000000>;
  	};
  
@@ -60,7 +60,7 @@ index d598b6391362..024e52a6cd0f 100644
  	};
  
 -	memory {
-+	memory at 80000000 {
++	memory@80000000 {
  		reg = <0x80000000 0x40000000>;
  	};
  
@@ -78,9 +78,15 @@ index 43ed13963d35..33d704541de6 100644
  	};
  
 -	memory {
-+	memory at 80000000 {
++	memory@80000000 {
  		reg = <0x80000000 0x20000000>;
  	};
  
 -- 
 2.19.1
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index cbb7426..e13169d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,14 +2,23 @@
  "From\0Sasha Levin <sashal@kernel.org>\0"
  "Subject\0[PATCH AUTOSEL 4.20 111/304] ARM: dts: aspeed: add missing memory unit-address\0"
  "Date\0Mon, 28 Jan 2019 10:40:28 -0500\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0linux-kernel@vger.kernel.org"
+ " stable@vger.kernel.org\0"
+ "Cc\0Sasha Levin <sashal@kernel.org>"
+  Rob Herring <robh@kernel.org>
+  linux-aspeed@lists.ozlabs.org
+  devicetree@vger.kernel.org
+  Andrew Jeffery <andrew@aj.id.au>
+  Joel Stanley <joel@jms.id.au>
+  Olof Johansson <olof@lixom.net>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "From: Rob Herring <robh@kernel.org>\n"
  "\n"
  "[ Upstream commit 8ef86955fe59f7912a40d57ae4c6d511f0187b4d ]\n"
  "\n"
- "The base aspeed-g5.dtsi already defines a '/memory at 80000000' node, so\n"
+ "The base aspeed-g5.dtsi already defines a '/memory@80000000' node, so\n"
  "'/memory' in the board files create a duplicate node. We're probably\n"
  "getting lucky that the bootloader fixes up the memory node that the\n"
  "kernel ends up using. Add the unit-address so it's merged with the base\n"
@@ -19,9 +28,9 @@
  "\n"
  "Cc: Joel Stanley <joel@jms.id.au>\n"
  "Cc: Andrew Jeffery <andrew@aj.id.au>\n"
- "Cc: devicetree at vger.kernel.org\n"
- "Cc: linux-arm-kernel at lists.infradead.org\n"
- "Cc: linux-aspeed at lists.ozlabs.org\n"
+ "Cc: devicetree@vger.kernel.org\n"
+ "Cc: linux-arm-kernel@lists.infradead.org\n"
+ "Cc: linux-aspeed@lists.ozlabs.org\n"
  "Signed-off-by: Rob Herring <robh@kernel.org>\n"
  "Signed-off-by: Olof Johansson <olof@lixom.net>\n"
  "Signed-off-by: Sasha Levin <sashal@kernel.org>\n"
@@ -41,7 +50,7 @@
  " \t};\n"
  " \n"
  "-\tmemory {\n"
- "+\tmemory at 80000000 {\n"
+ "+\tmemory@80000000 {\n"
  " \t\treg = <0x80000000 0x40000000>;\n"
  " \t};\n"
  " \n"
@@ -54,7 +63,7 @@
  " \t};\n"
  " \n"
  "-\tmemory {\n"
- "+\tmemory at 80000000 {\n"
+ "+\tmemory@80000000 {\n"
  " \t\treg = <0x80000000 0x20000000>;\n"
  " \t};\n"
  " \n"
@@ -67,7 +76,7 @@
  " \t};\n"
  " \n"
  "-\tmemory {\n"
- "+\tmemory at 80000000 {\n"
+ "+\tmemory@80000000 {\n"
  " \t\treg = <0x80000000 0x40000000>;\n"
  " \t};\n"
  " \n"
@@ -85,11 +94,17 @@
  " \t};\n"
  " \n"
  "-\tmemory {\n"
- "+\tmemory at 80000000 {\n"
+ "+\tmemory@80000000 {\n"
  " \t\treg = <0x80000000 0x20000000>;\n"
  " \t};\n"
  " \n"
  "-- \n"
- 2.19.1
+ "2.19.1\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-944d064debf8d6710ef717040a75ebbeadbbdf07af8a05d07e1ae5ce1cf8aabd
+c8c49dbe45dd5a2a944f7d40d990935fe5e7c2a6ada4c22ead7c5f1cc77ab788
