diff for duplicates of <20160421104022.2d6549a9@xhacker>

diff --git a/a/1.txt b/N1/1.txt
index 6ec019c..58fe5ac 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,8 +11,8 @@ On Wed, 20 Apr 2016 17:16:00 +0300 Andy Shevchenko wrote:
 > > > 
 > > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
 > > > ---
-> > >   drivers/i2c/busses/i2c-designware-platdrv.c | 2 ++
-> > >   1 file changed, 2 insertions(+)
+> > > ? drivers/i2c/busses/i2c-designware-platdrv.c | 2 ++
+> > > ? 1 file changed, 2 insertions(+)
 > > > 
 > > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c
 > > > b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -20,25 +20,25 @@ On Wed, 20 Apr 2016 17:16:00 +0300 Andy Shevchenko wrote:
 > > > --- a/drivers/i2c/busses/i2c-designware-platdrv.c
 > > > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
 > > > @@ -268,6 +268,8 @@ rpm_disable:
-> > >   		pm_runtime_put_noidle(&pdev->dev);
-> > >   	}
+> > > ??		pm_runtime_put_noidle(&pdev->dev);
+> > > ??	}
 > > > 
 > > > +	i2c_dw_plat_prepare_clk(dev, false);
 > > > +
-> > >   	return r;
-> > >   }
+> > > ??	return r;
+> > > ? }
 > > >   
 > > This is a bit unclear to me does devm_clk_get take care of clk
-> > disabling 
+> > disabling?
 > > in case of probe error or driver removal?
 > > 
-> > I see Andy's 1cb715ca4694 ("i2c-designware: move to managed functions 
-> > (devm_*)") removed it but at quick look drivers/clk/clk-devres.c: 
-> > devm_clk_release() calls only clk_put and I don't see disable is done 
+> > I see Andy's 1cb715ca4694 ("i2c-designware: move to managed functions?
+> > (devm_*)") removed it but at quick look drivers/clk/clk-devres.c:?
+> > devm_clk_release() calls only clk_put and I don't see disable is done?
 > > down the path.  
 > 
 > The following is a mistake of the mentioned patch.
-> -       clk_disable_unprepare(dev->clk);
+> -???????clk_disable_unprepare(dev->clk);
 > 
 > I did at the same mistake in dw_dmac driver which had been fixed later
 > in the commit 8be4f523b480 ("dmaengine: dw: fix regression in dw_probe()
@@ -50,8 +50,3 @@ but doesn't unprepare and disable the clk
 
 Thanks,
 Jisheng
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index d3b97fc..6dedfa7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,16 +2,10 @@
  "ref\01460638414-5987-3-git-send-email-jszhang@marvell.com\0"
  "ref\057177C32.4090000@linux.intel.com\0"
  "ref\01461161760.6620.306.camel@linux.intel.com\0"
- "From\0Jisheng Zhang <jszhang@marvell.com>\0"
- "Subject\0Re: [PATCH 2/4] i2c: designware-platdrv: fix unbalanced clk enable and prepare\0"
+ "From\0jszhang@marvell.com (Jisheng Zhang)\0"
+ "Subject\0[PATCH 2/4] i2c: designware-platdrv: fix unbalanced clk enable and prepare\0"
  "Date\0Thu, 21 Apr 2016 10:40:22 +0800\0"
- "To\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0"
- "Cc\0wsa@the-dreams.de"
-  linux-kernel@vger.kernel.org
-  Jarkko Nikula <jarkko.nikula@linux.intel.com>
-  linux-i2c@vger.kernel.org
-  mika.westerberg@linux.intel.com
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Dear Jarkko, Andy,\n"
@@ -27,8 +21,8 @@
  "> > > \n"
  "> > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com>\n"
  "> > > ---\n"
- "> > > \302\240 drivers/i2c/busses/i2c-designware-platdrv.c | 2 ++\n"
- "> > > \302\240 1 file changed, 2 insertions(+)\n"
+ "> > > ? drivers/i2c/busses/i2c-designware-platdrv.c | 2 ++\n"
+ "> > > ? 1 file changed, 2 insertions(+)\n"
  "> > > \n"
  "> > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c\n"
  "> > > b/drivers/i2c/busses/i2c-designware-platdrv.c\n"
@@ -36,25 +30,25 @@
  "> > > --- a/drivers/i2c/busses/i2c-designware-platdrv.c\n"
  "> > > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c\n"
  "> > > @@ -268,6 +268,8 @@ rpm_disable:\n"
- "> > > \302\240\302\240\t\tpm_runtime_put_noidle(&pdev->dev);\n"
- "> > > \302\240\302\240\t}\n"
+ "> > > ??\t\tpm_runtime_put_noidle(&pdev->dev);\n"
+ "> > > ??\t}\n"
  "> > > \n"
  "> > > +\ti2c_dw_plat_prepare_clk(dev, false);\n"
  "> > > +\n"
- "> > > \302\240\302\240\treturn r;\n"
- "> > > \302\240 }\n"
+ "> > > ??\treturn r;\n"
+ "> > > ? }\n"
  "> > >   \n"
  "> > This is a bit unclear to me does devm_clk_get take care of clk\n"
- "> > disabling\302\240\n"
+ "> > disabling?\n"
  "> > in case of probe error or driver removal?\n"
  "> > \n"
- "> > I see Andy's 1cb715ca4694 (\"i2c-designware: move to managed functions\302\240\n"
- "> > (devm_*)\") removed it but at quick look drivers/clk/clk-devres.c:\302\240\n"
- "> > devm_clk_release() calls only clk_put and I don't see disable is done\302\240\n"
+ "> > I see Andy's 1cb715ca4694 (\"i2c-designware: move to managed functions?\n"
+ "> > (devm_*)\") removed it but at quick look drivers/clk/clk-devres.c:?\n"
+ "> > devm_clk_release() calls only clk_put and I don't see disable is done?\n"
  "> > down the path.  \n"
  "> \n"
  "> The following is a mistake of the mentioned patch.\n"
- "> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240clk_disable_unprepare(dev->clk);\n"
+ "> -???????clk_disable_unprepare(dev->clk);\n"
  "> \n"
  "> I did at the same mistake in dw_dmac driver which had been fixed later\n"
  "> in the commit 8be4f523b480 (\"dmaengine: dw: fix regression in dw_probe()\n"
@@ -65,11 +59,6 @@
  "but doesn't unprepare and disable the clk\n"
  "\n"
  "Thanks,\n"
- "Jisheng\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ Jisheng
 
-1c36b2e89fb19196b9688a9cf0360a48df8c45354627d2be9c7e387b8fc74aa9
+3edd10dc57c15c734afd5bdb03f54d7ceb06d8002f6315ab19d8e18a7e537113
