diff for duplicates of <546B0CD2.401@redhat.com> diff --git a/a/1.txt b/N1/1.txt index b3c29bb..d03aea9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ On 11/18/2014 09:47 AM, Ian Campbell wrote: >>>>>> + #size-cells = <1>; >>>>>> + ranges; >>>>>> + ->>>>>> + framebuffer@0 { +>>>>>> + framebuffer at 0 { >>>>>> + compatible = "sunxi,framebuffer", "simple-framebuffer"; >>>>>> + sunxi,pipeline = <0>; >>>>>> + sunxi,output = "hdmi"; diff --git a/a/content_digest b/N1/content_digest index f6ec8ab..159811a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,9 +5,9 @@ "ref\020141117155514.GU6414@lukather\0" "ref\0546B0026.2010107@redhat.com\0" "ref\01416300438.25454.40.camel@hellion.org.uk\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [PATCH 2/2] dt-bindings: simplefb-sunxi: Add sunxi simplefb extensions\0" - "Date\0Tue, 18 Nov 2014 09:09:38 +0000\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH 2/2] dt-bindings: simplefb-sunxi: Add sunxi simplefb extensions\0" + "Date\0Tue, 18 Nov 2014 10:09:38 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -62,7 +62,7 @@ ">>>>>> + #size-cells = <1>;\n" ">>>>>> + ranges;\n" ">>>>>> +\n" - ">>>>>> + framebuffer@0 {\n" + ">>>>>> + framebuffer at 0 {\n" ">>>>>> + compatible = \"sunxi,framebuffer\", \"simple-framebuffer\";\n" ">>>>>> + sunxi,pipeline = <0>;\n" ">>>>>> + sunxi,output = \"hdmi\";\n" @@ -117,4 +117,4 @@ "\n" Hans -013590dc9732da561f8440213bf75876f131b7f92754d82f0d44aebd8ab3655e +50edc25444f11ec28da1a49cb72ed2c40ee7e0a625cee6bd8a1579b321b0462a
diff --git a/a/1.txt b/N2/1.txt index b3c29bb..b7b1093 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -7,13 +7,13 @@ On 11/18/2014 09:47 AM, Ian Campbell wrote: >> On 11/17/2014 04:55 PM, Maxime Ripard wrote: >>> On Mon, Nov 17, 2014 at 01:39:18PM +0000, Grant Likely wrote: >>>> On Mon, Nov 17, 2014 at 12:47 PM, Maxime Ripard ->>>> <maxime.ripard@free-electrons.com> wrote: +>>>> <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote: >>>>> On Mon, Nov 17, 2014 at 12:34:46PM +0100, Hans de Goede wrote: >>>>>> If pre-filled framebuffer nodes are used, the firmware may need extra >>>>>> properties to find the right node. This documents the properties to use >>>>>> for this on sunxi platforms. >>>>>> ->>>>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> +>>>>>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> >>>>>> --- >>>>>> .../bindings/video/simple-framebuffer-sunxi.txt | 33 ++++++++++++++++++++++ >>>>>> 1 file changed, 33 insertions(+) diff --git a/a/content_digest b/N2/content_digest index f6ec8ab..e92f27d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,10 +5,21 @@ "ref\020141117155514.GU6414@lukather\0" "ref\0546B0026.2010107@redhat.com\0" "ref\01416300438.25454.40.camel@hellion.org.uk\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" + "ref\01416300438.25454.40.camel-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org\0" + "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" "Subject\0Re: [PATCH 2/2] dt-bindings: simplefb-sunxi: Add sunxi simplefb extensions\0" - "Date\0Tue, 18 Nov 2014 09:09:38 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 18 Nov 2014 10:09:38 +0100\0" + "To\0Ian Campbell <ijc-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>\0" + "Cc\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + David Herrmann <dh.herrmann-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> + linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " linux-sunxi <linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>\0" "\00:1\0" "b\0" "Hi,\n" @@ -20,13 +31,13 @@ ">> On 11/17/2014 04:55 PM, Maxime Ripard wrote:\n" ">>> On Mon, Nov 17, 2014 at 01:39:18PM +0000, Grant Likely wrote:\n" ">>>> On Mon, Nov 17, 2014 at 12:47 PM, Maxime Ripard\n" - ">>>> <maxime.ripard@free-electrons.com> wrote:\n" + ">>>> <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote:\n" ">>>>> On Mon, Nov 17, 2014 at 12:34:46PM +0100, Hans de Goede wrote:\n" ">>>>>> If pre-filled framebuffer nodes are used, the firmware may need extra\n" ">>>>>> properties to find the right node. This documents the properties to use\n" ">>>>>> for this on sunxi platforms.\n" ">>>>>>\n" - ">>>>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" + ">>>>>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" ">>>>>> ---\n" ">>>>>> .../bindings/video/simple-framebuffer-sunxi.txt | 33 ++++++++++++++++++++++\n" ">>>>>> 1 file changed, 33 insertions(+)\n" @@ -117,4 +128,4 @@ "\n" Hans -013590dc9732da561f8440213bf75876f131b7f92754d82f0d44aebd8ab3655e +cb4abd13dfcc60d556131600e0c1674efd3d8deba3bb1af5eed235701194e5e4
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.