diff for duplicates of <4D52FC1A.9090700@bluewatersys.com> diff --git a/a/1.txt b/N1/1.txt index 32e7437..5b78d9b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On 02/10/2011 09:39 AM, Uwe Kleine-König wrote: +On 02/10/2011 09:39 AM, Uwe Kleine-K?nig wrote: > Hi Ryan, > > On Thu, Feb 10, 2011 at 09:21:14AM +1300, Ryan Mallon wrote: @@ -9,7 +9,7 @@ On 02/10/2011 09:39 AM, Uwe Kleine-König wrote: >>> + >>> + spin_lock_irqsave(&clk->enable_lock, flags); >> ->> WARN_ON(clk->prepare_count = 0); ? +>> WARN_ON(clk->prepare_count == 0); ? > This is added in patch 3/3 Ah, missed that. I still think that patch 3 should just be rolled into @@ -23,7 +23,7 @@ reviewing harder for one thing :-). Bluewater Systems Ltd - ARM Technology Solution Centre Ryan Mallon 5 Amuri Park, 404 Barbadoes St -ryan@bluewatersys.com PO Box 13 889, Christchurch 8013 +ryan at bluewatersys.com PO Box 13 889, Christchurch 8013 http://www.bluewatersys.com New Zealand Phone: +64 3 3779127 Freecall: Australia 1800 148 751 Fax: +64 3 3779135 USA 1800 261 2934 diff --git a/a/content_digest b/N1/content_digest index 8377a44..9304345 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "ref\01297233693.242364.862698430999.1.gpush@pororo\0" "ref\04D52F73A.4010707@bluewatersys.com\0" "ref\020110209203900.GT27982@pengutronix.de\0" - "From\0Ryan Mallon <ryan@bluewatersys.com>\0" - "Subject\0Re: [RFC,PATCH 1/3] Add a common struct clk\0" - "Date\0Wed, 09 Feb 2011 20:42:02 +0000\0" + "From\0ryan@bluewatersys.com (Ryan Mallon)\0" + "Subject\0[RFC,PATCH 1/3] Add a common struct clk\0" + "Date\0Thu, 10 Feb 2011 09:42:02 +1300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 02/10/2011 09:39 AM, Uwe Kleine-K\303\266nig wrote:\n" + "On 02/10/2011 09:39 AM, Uwe Kleine-K?nig wrote:\n" "> Hi Ryan,\n" "> \n" "> On Thu, Feb 10, 2011 at 09:21:14AM +1300, Ryan Mallon wrote:\n" @@ -18,7 +18,7 @@ ">>> +\n" ">>> +\tspin_lock_irqsave(&clk->enable_lock, flags);\n" ">>\n" - ">> \tWARN_ON(clk->prepare_count = 0); ?\n" + ">> \tWARN_ON(clk->prepare_count == 0); ?\n" "> This is added in patch 3/3\n" "\n" "Ah, missed that. I still think that patch 3 should just be rolled into\n" @@ -32,9 +32,9 @@ "Bluewater Systems Ltd - ARM Technology Solution Centre\n" "\n" "Ryan Mallon \t\t5 Amuri Park, 404 Barbadoes St\n" - "ryan@bluewatersys.com \tPO Box 13 889, Christchurch 8013\n" + "ryan at bluewatersys.com \tPO Box 13 889, Christchurch 8013\n" "http://www.bluewatersys.com\tNew Zealand\n" "Phone: +64 3 3779127\t\tFreecall: Australia 1800 148 751\n" "Fax: +64 3 3779135\t\t\t USA 1800 261 2934" -aad2c3e0ae3925cb0d4c1f307701d6cd6db65f59cc867f33546e1c8d7b450668 +e9a5bd4b5123fee9611a70c1546501194af3b00d96bf811a1bfe4844444195d6
diff --git a/a/1.txt b/N2/1.txt index 32e7437..b1ee3fe 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,7 +9,7 @@ On 02/10/2011 09:39 AM, Uwe Kleine-König wrote: >>> + >>> + spin_lock_irqsave(&clk->enable_lock, flags); >> ->> WARN_ON(clk->prepare_count = 0); ? +>> WARN_ON(clk->prepare_count == 0); ? > This is added in patch 3/3 Ah, missed that. I still think that patch 3 should just be rolled into diff --git a/a/content_digest b/N2/content_digest index 8377a44..a5da446 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,22 @@ "ref\020110209203900.GT27982@pengutronix.de\0" "From\0Ryan Mallon <ryan@bluewatersys.com>\0" "Subject\0Re: [RFC,PATCH 1/3] Add a common struct clk\0" - "Date\0Wed, 09 Feb 2011 20:42:02 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 10 Feb 2011 09:42:02 +1300\0" + "To\0Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\0" + "Cc\0Jeremy Kerr <jeremy.kerr@canonical.com>" + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + Nicolas Pitre <nicolas.pitre@linaro.org> + Dima Zavin <dmitriyz@google.com> + Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com> + Vincent Guittot <vincent.guittot@linaro.org> + linux-sh@vger.kernel.org + Ben Herrenschmidt <benh@kernel.crashing.org> + Sascha Hauer <s.hauer@pengutronix.de> + Paul Mundt <lethal@linux-sh.org> + Saravana Kannan <skannan@codeaurora.org> + Ben Dooks <ben-linux@fluff.org> + " Russell King <linux@arm.linux.org.uk>\0" "\00:1\0" "b\0" "On 02/10/2011 09:39 AM, Uwe Kleine-K\303\266nig wrote:\n" @@ -18,7 +32,7 @@ ">>> +\n" ">>> +\tspin_lock_irqsave(&clk->enable_lock, flags);\n" ">>\n" - ">> \tWARN_ON(clk->prepare_count = 0); ?\n" + ">> \tWARN_ON(clk->prepare_count == 0); ?\n" "> This is added in patch 3/3\n" "\n" "Ah, missed that. I still think that patch 3 should just be rolled into\n" @@ -37,4 +51,4 @@ "Phone: +64 3 3779127\t\tFreecall: Australia 1800 148 751\n" "Fax: +64 3 3779135\t\t\t USA 1800 261 2934" -aad2c3e0ae3925cb0d4c1f307701d6cd6db65f59cc867f33546e1c8d7b450668 +87ddfad3eda0ca6e3fcdea90f574c18373daae4307cad303c49a9ebc113906f3
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.