diff for duplicates of <1577850.BRVoxx5piP@avalon> diff --git a/a/1.txt b/N1/1.txt index 7d1862e..32fc309 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ On Wednesday 30 October 2013 09:10:19 Simon Horman wrote: > > > > place in the driver where we're allowed to sleep. > > > > > > > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> -> > > > Cc: linux-kernel@vger.kernel.org +> > > > Cc: linux-kernel at vger.kernel.org > > > > Signed-off-by: Laurent Pinchart > > > > <laurent.pinchart+renesas@ideasonboard.com> > > > @@ -91,7 +91,7 @@ Could I ask you to pick v2 up instead though ? :-) > > > > + goto err3; > > > > + > > > > -> > > > if (res2 && (resource_size(res2) = 4)) { +> > > > if (res2 && (resource_size(res2) == 4)) { > > > > > > > > /* assume both CMSTR and CMCSR to be 32-bit */ > > > > p->read_control = sh_cmt_read32; diff --git a/a/content_digest b/N1/content_digest index 96e55a0..608e0fa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01383000569-8916-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\09952506.6pWpQZf7WG@avalon\0" "ref\020131030001018.GF21262@verge.net.au\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 01/12] clocksource: sh_cmt: Add clk_prepare/unprepare support\0" - "Date\0Wed, 30 Oct 2013 00:13:40 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 01/12] clocksource: sh_cmt: Add clk_prepare/unprepare support\0" + "Date\0Wed, 30 Oct 2013 01:13:40 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -17,7 +17,7 @@ "> > > > place in the driver where we're allowed to sleep.\n" "> > > > \n" "> > > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org>\n" - "> > > > Cc: linux-kernel@vger.kernel.org\n" + "> > > > Cc: linux-kernel at vger.kernel.org\n" "> > > > Signed-off-by: Laurent Pinchart\n" "> > > > <laurent.pinchart+renesas@ideasonboard.com>\n" "> > > \n" @@ -100,7 +100,7 @@ "> > > > +\t\tgoto err3;\n" "> > > > +\n" "> > > > \n" - "> > > > \tif (res2 && (resource_size(res2) = 4)) {\n" + "> > > > \tif (res2 && (resource_size(res2) == 4)) {\n" "> > > > \t\n" "> > > > \t\t/* assume both CMSTR and CMCSR to be 32-bit */\n" "> > > > \t\tp->read_control = sh_cmt_read32;\n" @@ -146,4 +146,4 @@ "\n" Laurent Pinchart -ad5104da3bc6fa90ddba21259bbbb0e561eb2518e4015344138f80aa16153438 +deda1da699f43996000b9a0467c3bf801b90c981191c99662e604bfec84afc27
diff --git a/a/1.txt b/N2/1.txt index 7d1862e..36851bf 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -91,7 +91,7 @@ Could I ask you to pick v2 up instead though ? :-) > > > > + goto err3; > > > > + > > > > -> > > > if (res2 && (resource_size(res2) = 4)) { +> > > > if (res2 && (resource_size(res2) == 4)) { > > > > > > > > /* assume both CMSTR and CMCSR to be 32-bit */ > > > > p->read_control = sh_cmt_read32; diff --git a/a/content_digest b/N2/content_digest index 96e55a0..cb9d78a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,14 @@ "ref\020131030001018.GF21262@verge.net.au\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 01/12] clocksource: sh_cmt: Add clk_prepare/unprepare support\0" - "Date\0Wed, 30 Oct 2013 00:13:40 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 30 Oct 2013 01:13:40 +0100\0" + "To\0Simon Horman <horms@verge.net.au>\0" + "Cc\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" + linux-arm-kernel@lists.infradead.org + linux-sh@vger.kernel.org + Mike Turquette <mturquette@linaro.org> + Daniel Lezcano <daniel.lezcano@linaro.org> + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Simon,\n" @@ -100,7 +106,7 @@ "> > > > +\t\tgoto err3;\n" "> > > > +\n" "> > > > \n" - "> > > > \tif (res2 && (resource_size(res2) = 4)) {\n" + "> > > > \tif (res2 && (resource_size(res2) == 4)) {\n" "> > > > \t\n" "> > > > \t\t/* assume both CMSTR and CMCSR to be 32-bit */\n" "> > > > \t\tp->read_control = sh_cmt_read32;\n" @@ -146,4 +152,4 @@ "\n" Laurent Pinchart -ad5104da3bc6fa90ddba21259bbbb0e561eb2518e4015344138f80aa16153438 +eb806b03bf7d1deb5b86a5afd571cfcb54555df324e439df6ece244a896a5532
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.