diff for duplicates of <9952506.6pWpQZf7WG@avalon> diff --git a/a/1.txt b/N1/1.txt index 49e5627..df96fe5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On Tuesday 29 October 2013 14:55:35 Simon Horman wrote: > > 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> > @@ -60,7 +60,7 @@ Acked-by (for patches 01 to 03) ? > > + if (ret < 0) > > + 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; > > @@ -773,19 +783,21 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, diff --git a/a/content_digest b/N1/content_digest index 738b9fe..43a1e8d 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\01383000569-8916-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\020131029055534.GB11580@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\0Tue, 29 Oct 2013 09:55:05 +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\0Tue, 29 Oct 2013 10:55:05 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -15,7 +15,7 @@ "> > 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" @@ -69,7 +69,7 @@ "> > +\tif (ret < 0)\n" "> > +\t\tgoto err3;\n" "> > +\n" - "> > \tif (res2 && (resource_size(res2) = 4)) {\n" + "> > \tif (res2 && (resource_size(res2) == 4)) {\n" "> > \t\t/* assume both CMSTR and CMCSR to be 32-bit */\n" "> > \t\tp->read_control = sh_cmt_read32;\n" "> > @@ -773,19 +783,21 @@ static int sh_cmt_setup(struct sh_cmt_priv *p,\n" @@ -103,4 +103,4 @@ "\n" Laurent Pinchart -7e6289ca5f6f44eaf3d1bf74c38853ec56114e925a1167ca34bf4894859cb97a +ae4028256dd5a035ab52ff992fd6eb4dec20efb8598b2eec5f2801486e2dfe5f
diff --git a/a/1.txt b/N2/1.txt index 49e5627..b036e7f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -60,7 +60,7 @@ Acked-by (for patches 01 to 03) ? > > + if (ret < 0) > > + 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; > > @@ -773,19 +783,21 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, diff --git a/a/content_digest b/N2/content_digest index 738b9fe..1494890 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,14 @@ "ref\020131029055534.GB11580@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\0Tue, 29 Oct 2013 09:55:05 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 29 Oct 2013 10:55:05 +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" @@ -69,7 +75,7 @@ "> > +\tif (ret < 0)\n" "> > +\t\tgoto err3;\n" "> > +\n" - "> > \tif (res2 && (resource_size(res2) = 4)) {\n" + "> > \tif (res2 && (resource_size(res2) == 4)) {\n" "> > \t\t/* assume both CMSTR and CMCSR to be 32-bit */\n" "> > \t\tp->read_control = sh_cmt_read32;\n" "> > @@ -773,19 +783,21 @@ static int sh_cmt_setup(struct sh_cmt_priv *p,\n" @@ -103,4 +109,4 @@ "\n" Laurent Pinchart -7e6289ca5f6f44eaf3d1bf74c38853ec56114e925a1167ca34bf4894859cb97a +4e1205cf6e776f793d8cef059bac756cc2a98de9302fcf4e3b199d92bf8fd429
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.