diff for duplicates of <20180618045902.11453-2-benh@kernel.crashing.org> diff --git a/a/content_digest b/N1/content_digest index 80a061b..2fe646d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020180618045902.11453-1-benh@kernel.crashing.org\0" - "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" + "From\0benh@kernel.crashing.org (Benjamin Herrenschmidt)\0" "Subject\0[PATCH v2 1/4] arm: dts: Fix error in Aspeed OpenPower Romulus device-tree\0" "Date\0Mon, 18 Jun 2018 14:58:59 +1000\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The reserved memory for the VGA frame buffer is at the wrong address\n" @@ -33,4 +33,4 @@ "-- \n" 2.17.1 -6cc6191b615ebf0c40c2d4c8873778d3b4d214f71ece57b28bfb3d87bef620ea +6aca61cc902cda7441bff2cbd4e2a13533dcd235eb564026b483a99fe920bf6f
diff --git a/a/1.txt b/N2/1.txt index 53fe052..7137494 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,13 +15,13 @@ index 0b9b37d4d6ef..7d28c03a9e0b 100644 #size-cells = <1>; ranges; -- vga_memory: framebuffer at bf000000 { -+ vga_memory: framebuffer at 9f000000 { +- vga_memory: framebuffer@bf000000 { ++ vga_memory: framebuffer@9f000000 { no-map; - reg = <0xbf000000 0x01000000>; /* 16M */ + reg = <0x9f000000 0x01000000>; /* 16M */ }; - flash_memory: region at 98000000 { + flash_memory: region@98000000 { -- 2.17.1 diff --git a/a/content_digest b/N2/content_digest index 80a061b..7187aa1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,12 @@ "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0[PATCH v2 1/4] arm: dts: Fix error in Aspeed OpenPower Romulus device-tree\0" "Date\0Mon, 18 Jun 2018 14:58:59 +1000\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0Joel Stanley <joel@jms.id.au>\0" + "Cc\0Andrew Jeffery <andrew@aj.id.au>" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-aspeed@lists.ozlabs.org + " Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "\00:1\0" "b\0" "The reserved memory for the VGA frame buffer is at the wrong address\n" @@ -22,15 +27,15 @@ " \t\t#size-cells = <1>;\n" " \t\tranges;\n" " \n" - "-\t\tvga_memory: framebuffer at bf000000 {\n" - "+\t\tvga_memory: framebuffer at 9f000000 {\n" + "-\t\tvga_memory: framebuffer@bf000000 {\n" + "+\t\tvga_memory: framebuffer@9f000000 {\n" " \t\t\tno-map;\n" "-\t\t\treg = <0xbf000000 0x01000000>; /* 16M */\n" "+\t\t\treg = <0x9f000000 0x01000000>; /* 16M */\n" " \t\t};\n" " \n" - " \t\tflash_memory: region at 98000000 {\n" + " \t\tflash_memory: region@98000000 {\n" "-- \n" 2.17.1 -6cc6191b615ebf0c40c2d4c8873778d3b4d214f71ece57b28bfb3d87bef620ea +1bfe89f6e7979f7cc5eeb67ce1b8c26e7b1d241ada5c97b22f7b20e582147c2a
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.