diff for duplicates of <5465D94D.50805@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 581a0cf..63ac4f9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,7 @@ On 11/14/2014 10:42 AM, Grant Likely wrote: >> properly enabled. >> >> Signed-off-by: Luc Verhaegen <libv@skynet.be> ->> [hdegoede@redhat.com: Change clks from list to dynamic array] +>> [hdegoede at redhat.com: Change clks from list to dynamic array] >> Reviewed-by: Hans de Goede <hdegoede@redhat.com> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> @@ -117,7 +117,7 @@ Will fix for v7. There is no version of devm_clk_get which takes an index rather then a name. >> + if (IS_ERR(clock)) { ->> + if (PTR_ERR(clock) = -EPROBE_DEFER) { +>> + if (PTR_ERR(clock) == -EPROBE_DEFER) { >> + while (--i >= 0) { >> + if (par->clks[i]) >> + clk_put(par->clks[i]); diff --git a/a/content_digest b/N1/content_digest index 670c0da..c40cd07 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01415906546-2408-1-git-send-email-hdegoede@redhat.com\0" "ref\0CACxGe6uB-J8_uzNJqCOEjM5G8=Bq=KFf-O1tfXVwP0=cMY+7iw@mail.gmail.com\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [PATCH v6] simplefb: add clock handling code\0" - "Date\0Fri, 14 Nov 2014 10:28:29 +0000\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH v6] simplefb: add clock handling code\0" + "Date\0Fri, 14 Nov 2014 11:28:29 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -18,7 +18,7 @@ ">> properly enabled.\n" ">>\n" ">> Signed-off-by: Luc Verhaegen <libv@skynet.be>\n" - ">> [hdegoede@redhat.com: Change clks from list to dynamic array]\n" + ">> [hdegoede at redhat.com: Change clks from list to dynamic array]\n" ">> Reviewed-by: Hans de Goede <hdegoede@redhat.com>\n" ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" ">> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>\n" @@ -125,7 +125,7 @@ "There is no version of devm_clk_get which takes an index rather then a name.\n" "\n" ">> + if (IS_ERR(clock)) {\n" - ">> + if (PTR_ERR(clock) = -EPROBE_DEFER) {\n" + ">> + if (PTR_ERR(clock) == -EPROBE_DEFER) {\n" ">> + while (--i >= 0) {\n" ">> + if (par->clks[i])\n" ">> + clk_put(par->clks[i]);\n" @@ -236,4 +236,4 @@ "\n" Hans -fa0b40679175af3966a8aee75e27cb7311e6af0e3bb628070ca0259b250959ba +2eb773749476443507aefdfd970f58898d71ad1ebf205152adca4cc928efd856
diff --git a/a/1.txt b/N2/1.txt index 581a0cf..cf7ccc4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,22 +1,22 @@ Hi, On 11/14/2014 10:42 AM, Grant Likely wrote: -> On Thu, Nov 13, 2014 at 7:22 PM, Hans de Goede <hdegoede@redhat.com> wrote: ->> From: Luc Verhaegen <libv@skynet.be> +> On Thu, Nov 13, 2014 at 7:22 PM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: +>> From: Luc Verhaegen <libv-AgBVmzD5pcezQB+pC5nmwQ@public.gmane.org> >> >> This claims and enables clocks listed in the simple framebuffer dt node. >> This is needed so that the display engine, in case the required clocks >> are known by the kernel code and are described in the dt, will remain >> properly enabled. >> ->> Signed-off-by: Luc Verhaegen <libv@skynet.be> ->> [hdegoede@redhat.com: Change clks from list to dynamic array] ->> Reviewed-by: Hans de Goede <hdegoede@redhat.com> ->> Signed-off-by: Hans de Goede <hdegoede@redhat.com> ->> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> ->> Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com> ->> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> ->> Acked-by: Grant Likely <grant.likely@linaro.org> +>> Signed-off-by: Luc Verhaegen <libv-AgBVmzD5pcezQB+pC5nmwQ@public.gmane.org> +>> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Change clks from list to dynamic array] +>> Reviewed-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +>> Acked-by: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> +>> Reviewed-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +>> Reviewed-by: David Herrmann <dh.herrmann-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +>> Acked-by: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> >> -- >> Changes in v4: >> -change clks from linkedlist to dynamic allocated array @@ -117,7 +117,7 @@ Will fix for v7. There is no version of devm_clk_get which takes an index rather then a name. >> + if (IS_ERR(clock)) { ->> + if (PTR_ERR(clock) = -EPROBE_DEFER) { +>> + if (PTR_ERR(clock) == -EPROBE_DEFER) { >> + while (--i >= 0) { >> + if (par->clks[i]) >> + clk_put(par->clks[i]); diff --git a/a/content_digest b/N2/content_digest index 670c0da..0f2b4e8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,30 +1,43 @@ "ref\01415906546-2408-1-git-send-email-hdegoede@redhat.com\0" "ref\0CACxGe6uB-J8_uzNJqCOEjM5G8=Bq=KFf-O1tfXVwP0=cMY+7iw@mail.gmail.com\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" + "ref\0CACxGe6uB-J8_uzNJqCOEjM5G8=Bq=KFf-O1tfXVwP0=cMY+7iw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\0" + "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" "Subject\0Re: [PATCH v6] simplefb: add clock handling code\0" - "Date\0Fri, 14 Nov 2014 10:28:29 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 14 Nov 2014 11:28:29 +0100\0" + "To\0Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org>" + Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> + Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Luc Verhaegen <libv-AgBVmzD5pcezQB+pC5nmwQ@public.gmane.org> + Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@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" "\n" "On 11/14/2014 10:42 AM, Grant Likely wrote:\n" - "> On Thu, Nov 13, 2014 at 7:22 PM, Hans de Goede <hdegoede@redhat.com> wrote:\n" - ">> From: Luc Verhaegen <libv@skynet.be>\n" + "> On Thu, Nov 13, 2014 at 7:22 PM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:\n" + ">> From: Luc Verhaegen <libv-AgBVmzD5pcezQB+pC5nmwQ@public.gmane.org>\n" ">>\n" ">> This claims and enables clocks listed in the simple framebuffer dt node.\n" ">> This is needed so that the display engine, in case the required clocks\n" ">> are known by the kernel code and are described in the dt, will remain\n" ">> properly enabled.\n" ">>\n" - ">> Signed-off-by: Luc Verhaegen <libv@skynet.be>\n" - ">> [hdegoede@redhat.com: Change clks from list to dynamic array]\n" - ">> Reviewed-by: Hans de Goede <hdegoede@redhat.com>\n" - ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" - ">> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>\n" - ">> Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n" - ">> Reviewed-by: David Herrmann <dh.herrmann@gmail.com>\n" - ">> Acked-by: Grant Likely <grant.likely@linaro.org>\n" + ">> Signed-off-by: Luc Verhaegen <libv-AgBVmzD5pcezQB+pC5nmwQ@public.gmane.org>\n" + ">> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Change clks from list to dynamic array]\n" + ">> Reviewed-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + ">> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + ">> Acked-by: Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>\n" + ">> Reviewed-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" + ">> Reviewed-by: David Herrmann <dh.herrmann-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + ">> Acked-by: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" ">> --\n" ">> Changes in v4:\n" ">> -change clks from linkedlist to dynamic allocated array\n" @@ -125,7 +138,7 @@ "There is no version of devm_clk_get which takes an index rather then a name.\n" "\n" ">> + if (IS_ERR(clock)) {\n" - ">> + if (PTR_ERR(clock) = -EPROBE_DEFER) {\n" + ">> + if (PTR_ERR(clock) == -EPROBE_DEFER) {\n" ">> + while (--i >= 0) {\n" ">> + if (par->clks[i])\n" ">> + clk_put(par->clks[i]);\n" @@ -236,4 +249,4 @@ "\n" Hans -fa0b40679175af3966a8aee75e27cb7311e6af0e3bb628070ca0259b250959ba +1058db938410702853e537974290088ca98bc6cc3f967fb2774f960eca9cb2de
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.