diff for duplicates of <20181130015251.20754-1-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 0097d29..1b4af2e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -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 @@ -8,9 +8,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> --- Might be better to just remove the node altogether from the SoC dtsi @@ -31,7 +31,7 @@ index df1227613d48..c2ece0b91885 100644 }; - memory { -+ memory at 80000000 { ++ memory@80000000 { reg = <0x80000000 0x40000000>; }; @@ -44,7 +44,7 @@ index 7a291de02543..22dade6393d0 100644 }; - memory { -+ memory at 80000000 { ++ memory@80000000 { reg = <0x80000000 0x20000000>; }; @@ -57,7 +57,7 @@ index d598b6391362..024e52a6cd0f 100644 }; - memory { -+ memory at 80000000 { ++ memory@80000000 { reg = <0x80000000 0x40000000>; }; @@ -75,9 +75,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 c43d286..c2c1ee9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,15 @@ "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] ARM: dts: aspeed: add missing memory unit-address\0" "Date\0Thu, 29 Nov 2018 19:52:51 -0600\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0arm@kernel.org" + Joel Stanley <joel@jms.id.au> + " Andrew Jeffery <andrew@aj.id.au>\0" + "Cc\0devicetree@vger.kernel.org" + linux-aspeed@lists.ozlabs.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "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" @@ -14,9 +19,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" "---\n" "Might be better to just remove the node altogether from the SoC dtsi \n" @@ -37,7 +42,7 @@ " \t};\n" " \n" "-\tmemory {\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" " \t\treg = <0x80000000 0x40000000>;\n" " \t};\n" " \n" @@ -50,7 +55,7 @@ " \t};\n" " \n" "-\tmemory {\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" " \t\treg = <0x80000000 0x20000000>;\n" " \t};\n" " \n" @@ -63,7 +68,7 @@ " \t};\n" " \n" "-\tmemory {\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" " \t\treg = <0x80000000 0x40000000>;\n" " \t};\n" " \n" @@ -81,11 +86,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 -236bbac234a063416889d6ef61b561517ce492d27c4729cc4e7c16a076ba780f +4a3ac7f0d49509bd904425953e00888f557223bf888d4a6439145eaa70e17968
diff --git a/a/1.txt b/N2/1.txt index 0097d29..222cfbd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -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 @@ -8,9 +8,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> --- Might be better to just remove the node altogether from the SoC dtsi @@ -31,7 +31,7 @@ index df1227613d48..c2ece0b91885 100644 }; - memory { -+ memory at 80000000 { ++ memory@80000000 { reg = <0x80000000 0x40000000>; }; @@ -44,7 +44,7 @@ index 7a291de02543..22dade6393d0 100644 }; - memory { -+ memory at 80000000 { ++ memory@80000000 { reg = <0x80000000 0x20000000>; }; @@ -57,7 +57,7 @@ index d598b6391362..024e52a6cd0f 100644 }; - memory { -+ memory at 80000000 { ++ memory@80000000 { reg = <0x80000000 0x40000000>; }; @@ -75,7 +75,7 @@ index 43ed13963d35..33d704541de6 100644 }; - memory { -+ memory at 80000000 { ++ memory@80000000 { reg = <0x80000000 0x20000000>; }; diff --git a/a/content_digest b/N2/content_digest index c43d286..0d982fc 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,15 @@ "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] ARM: dts: aspeed: add missing memory unit-address\0" "Date\0Thu, 29 Nov 2018 19:52:51 -0600\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0arm@kernel.org" + Joel Stanley <joel@jms.id.au> + " Andrew Jeffery <andrew@aj.id.au>\0" + "Cc\0devicetree@vger.kernel.org" + linux-aspeed@lists.ozlabs.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "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" @@ -14,9 +19,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" "---\n" "Might be better to just remove the node altogether from the SoC dtsi \n" @@ -37,7 +42,7 @@ " \t};\n" " \n" "-\tmemory {\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" " \t\treg = <0x80000000 0x40000000>;\n" " \t};\n" " \n" @@ -50,7 +55,7 @@ " \t};\n" " \n" "-\tmemory {\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" " \t\treg = <0x80000000 0x20000000>;\n" " \t};\n" " \n" @@ -63,7 +68,7 @@ " \t};\n" " \n" "-\tmemory {\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" " \t\treg = <0x80000000 0x40000000>;\n" " \t};\n" " \n" @@ -81,11 +86,11 @@ " \t};\n" " \n" "-\tmemory {\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" " \t\treg = <0x80000000 0x20000000>;\n" " \t};\n" " \n" "-- \n" 2.19.1 -236bbac234a063416889d6ef61b561517ce492d27c4729cc4e7c16a076ba780f +91748c722929bfc35786ae8ff4e5a20dd8211e32bbb3832ade6433d0c71b3fd7
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.