diff for duplicates of <4D50541B.2030405@bluewatersys.com> diff --git a/a/1.txt b/N1/1.txt index cbb4fe0..39df45c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -124,7 +124,7 @@ rolled into this patch? > + > + mutex_lock(&clk->prepare_lock); -> + if (clk->prepare_count = 0) +> + if (clk->prepare_count == 0) > + ret = clk->ops->prepare(clk); > + > + if (!ret) @@ -141,7 +141,7 @@ rolled into this patch? > + return; > + > + mutex_lock(&clk->prepare_lock); -> + if (--clk->prepare_count = 0) +> + if (--clk->prepare_count == 0) > + clk->ops->unprepare(clk); > + > + mutex_unlock(&clk->prepare_lock); @@ -517,7 +517,7 @@ common struct clk? > * @clk: clock source > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ @@ -525,7 +525,7 @@ common struct clk? 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 c2a2604..7172500 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01297058877.800158.458894385837.1.gpush@pororo\0" - "From\0Ryan Mallon <ryan@bluewatersys.com>\0" - "Subject\0Re: [RFC,PATCH 1/3] Add a common struct clk\0" - "Date\0Mon, 07 Feb 2011 20:20:43 +0000\0" + "From\0ryan@bluewatersys.com (Ryan Mallon)\0" + "Subject\0[RFC,PATCH 1/3] Add a common struct clk\0" + "Date\0Tue, 08 Feb 2011 09:20:43 +1300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -131,7 +131,7 @@ "\n" "> +\n" "> +\tmutex_lock(&clk->prepare_lock);\n" - "> +\tif (clk->prepare_count = 0)\n" + "> +\tif (clk->prepare_count == 0)\n" "> +\t\tret = clk->ops->prepare(clk);\n" "> +\n" "> +\tif (!ret)\n" @@ -148,7 +148,7 @@ "> +\t\treturn;\n" "> +\n" "> +\tmutex_lock(&clk->prepare_lock);\n" - "> +\tif (--clk->prepare_count = 0)\n" + "> +\tif (--clk->prepare_count == 0)\n" "> +\t\tclk->ops->unprepare(clk);\n" "> +\n" "> +\tmutex_unlock(&clk->prepare_lock);\n" @@ -524,7 +524,7 @@ "> * @clk: clock source\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "> Please read the FAQ at http://www.tux.org/lkml/\n" "\n" @@ -532,9 +532,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" -f5cb8c33e36197d96f00bc8f6ce632f985e5ba3bf0a823ae162aee766dc2dd4b +59f88334967e3f524ba9203e787c1209833fe8d31e9c078efed129895ac494b1
diff --git a/a/1.txt b/N2/1.txt index cbb4fe0..0a4f0c3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -124,7 +124,7 @@ rolled into this patch? > + > + mutex_lock(&clk->prepare_lock); -> + if (clk->prepare_count = 0) +> + if (clk->prepare_count == 0) > + ret = clk->ops->prepare(clk); > + > + if (!ret) @@ -141,7 +141,7 @@ rolled into this patch? > + return; > + > + mutex_lock(&clk->prepare_lock); -> + if (--clk->prepare_count = 0) +> + if (--clk->prepare_count == 0) > + clk->ops->unprepare(clk); > + > + mutex_unlock(&clk->prepare_lock); diff --git a/a/content_digest b/N2/content_digest index c2a2604..a381caa 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,22 @@ "ref\01297058877.800158.458894385837.1.gpush@pororo\0" "From\0Ryan Mallon <ryan@bluewatersys.com>\0" "Subject\0Re: [RFC,PATCH 1/3] Add a common struct clk\0" - "Date\0Mon, 07 Feb 2011 20:20:43 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 08 Feb 2011 09:20:43 +1300\0" + "To\0Jeremy Kerr <jeremy.kerr@canonical.com>\0" + "Cc\0linux-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> + " Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>" + 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/07/2011 07:07 PM, Jeremy Kerr wrote:\n" @@ -131,7 +145,7 @@ "\n" "> +\n" "> +\tmutex_lock(&clk->prepare_lock);\n" - "> +\tif (clk->prepare_count = 0)\n" + "> +\tif (clk->prepare_count == 0)\n" "> +\t\tret = clk->ops->prepare(clk);\n" "> +\n" "> +\tif (!ret)\n" @@ -148,7 +162,7 @@ "> +\t\treturn;\n" "> +\n" "> +\tmutex_lock(&clk->prepare_lock);\n" - "> +\tif (--clk->prepare_count = 0)\n" + "> +\tif (--clk->prepare_count == 0)\n" "> +\t\tclk->ops->unprepare(clk);\n" "> +\n" "> +\tmutex_unlock(&clk->prepare_lock);\n" @@ -537,4 +551,4 @@ "Phone: +64 3 3779127\t\tFreecall: Australia 1800 148 751\n" "Fax: +64 3 3779135\t\t\t USA 1800 261 2934" -f5cb8c33e36197d96f00bc8f6ce632f985e5ba3bf0a823ae162aee766dc2dd4b +9180be2ae9f5bdd17835456da452cd1234c7e848ef28ae77da774123c20786d0
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.