diff for duplicates of <1490728562.20764.9.camel@baylibre.com>

diff --git a/a/1.txt b/N1/1.txt
index cf6ea7d..0f0ef5b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,24 +5,24 @@ On Tue, 2017-03-28 at 11:25 +0200, Helmut Klein wrote:
 > 
 > Signed-off-by: Helmut Klein <hgkr.klein@gmail.com>
 > ---
-> ?drivers/tty/serial/meson_uart.c | 10 ++++++++++
-> ?1 file changed, 10 insertions(+)
+>  drivers/tty/serial/meson_uart.c | 10 ++++++++++
+>  1 file changed, 10 insertions(+)
 > 
 > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
 > index 60f16795d16b..cb99112288eb 100644
 > --- a/drivers/tty/serial/meson_uart.c
 > +++ b/drivers/tty/serial/meson_uart.c
 > @@ -600,6 +600,7 @@ static int meson_uart_probe(struct platform_device *pdev)
-> ?	struct resource *res_mem, *res_irq;
-> ?	struct uart_port *port;
-> ?	struct clk *clk;
+>  	struct resource *res_mem, *res_irq;
+>  	struct uart_port *port;
+>  	struct clk *clk;
 > +	struct clk *core_clk;
-> ?	int ret = 0;
+>  	int ret = 0;
 > 
-> ?	if (pdev->dev.of_node)
+>  	if (pdev->dev.of_node)
 > @@ -625,6 +626,15 @@ static int meson_uart_probe(struct platform_device *pdev)
-> ?	if (!port)
-> ?		return -ENOMEM;
+>  	if (!port)
+>  		return -ENOMEM;
 > 
 > +	core_clk = devm_clk_get(&pdev->dev, "core");
 > +	if (!IS_ERR(core_clk)) {
@@ -33,16 +33,21 @@ On Tue, 2017-03-28 at 11:25 +0200, Helmut Klein wrote:
 > +		}
 > +	}
 > +
-> ?	clk = clk_get(&pdev->dev, NULL);
+>  	clk = clk_get(&pdev->dev, NULL);
 Now that you have 2 clocks, shouldn't this be named as well ?
 
-> ?	if (IS_ERR(clk))
-> ?		return PTR_ERR(clk);
+>  	if (IS_ERR(clk))
+>  		return PTR_ERR(clk);
 > --
 > 2.11.0
 > 
 > 
 > _______________________________________________
 > linux-amlogic mailing list
-> linux-amlogic at lists.infradead.org
+> linux-amlogic@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-amlogic
+
+_______________________________________________
+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 df7aae0..5128cfa 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,16 @@
  "ref\020170328092545.4644-1-hgkr.klein@gmail.com\0"
  "ref\020170328092545.4644-4-hgkr.klein@gmail.com\0"
- "From\0jbrunet@baylibre.com (Jerome Brunet)\0"
- "Subject\0[PATCH v2, 3/3] tty/serial: meson_uart: add the core clock handling to the driver\0"
+ "From\0Jerome Brunet <jbrunet@baylibre.com>\0"
+ "Subject\0Re: [PATCH v2, 3/3] tty/serial: meson_uart: add the core clock handling to the driver\0"
  "Date\0Tue, 28 Mar 2017 21:16:02 +0200\0"
- "To\0linus-amlogic@lists.infradead.org\0"
+ "To\0Helmut Klein <hgkr.klein@gmail.com>"
+  gregkh@linuxfoundation.org
+  carlo@caione.org
+ " khilman@baylibre.com\0"
+ "Cc\0linux-amlogic@lists.infradead.org"
+  linux-serial@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, 2017-03-28 at 11:25 +0200, Helmut Klein wrote:\n"
@@ -13,24 +20,24 @@
  "> \n"
  "> Signed-off-by: Helmut Klein <hgkr.klein@gmail.com>\n"
  "> ---\n"
- "> ?drivers/tty/serial/meson_uart.c | 10 ++++++++++\n"
- "> ?1 file changed, 10 insertions(+)\n"
+ "> \302\240drivers/tty/serial/meson_uart.c | 10 ++++++++++\n"
+ "> \302\2401 file changed, 10 insertions(+)\n"
  "> \n"
  "> diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c\n"
  "> index 60f16795d16b..cb99112288eb 100644\n"
  "> --- a/drivers/tty/serial/meson_uart.c\n"
  "> +++ b/drivers/tty/serial/meson_uart.c\n"
  "> @@ -600,6 +600,7 @@ static int meson_uart_probe(struct platform_device *pdev)\n"
- "> ?\tstruct resource *res_mem, *res_irq;\n"
- "> ?\tstruct uart_port *port;\n"
- "> ?\tstruct clk *clk;\n"
+ "> \302\240\tstruct resource *res_mem, *res_irq;\n"
+ "> \302\240\tstruct uart_port *port;\n"
+ "> \302\240\tstruct clk *clk;\n"
  "> +\tstruct clk *core_clk;\n"
- "> ?\tint ret = 0;\n"
+ "> \302\240\tint ret = 0;\n"
  "> \n"
- "> ?\tif (pdev->dev.of_node)\n"
+ "> \302\240\tif (pdev->dev.of_node)\n"
  "> @@ -625,6 +626,15 @@ static int meson_uart_probe(struct platform_device *pdev)\n"
- "> ?\tif (!port)\n"
- "> ?\t\treturn -ENOMEM;\n"
+ "> \302\240\tif (!port)\n"
+ "> \302\240\t\treturn -ENOMEM;\n"
  "> \n"
  "> +\tcore_clk = devm_clk_get(&pdev->dev, \"core\");\n"
  "> +\tif (!IS_ERR(core_clk)) {\n"
@@ -41,18 +48,23 @@
  "> +\t\t}\n"
  "> +\t}\n"
  "> +\n"
- "> ?\tclk = clk_get(&pdev->dev, NULL);\n"
+ "> \302\240\tclk = clk_get(&pdev->dev, NULL);\n"
  "Now that you have 2 clocks, shouldn't this be named as well ?\n"
  "\n"
- "> ?\tif (IS_ERR(clk))\n"
- "> ?\t\treturn PTR_ERR(clk);\n"
+ "> \302\240\tif (IS_ERR(clk))\n"
+ "> \302\240\t\treturn PTR_ERR(clk);\n"
  "> --\n"
  "> 2.11.0\n"
  "> \n"
  "> \n"
  "> _______________________________________________\n"
  "> linux-amlogic mailing list\n"
- "> linux-amlogic at lists.infradead.org\n"
- > http://lists.infradead.org/mailman/listinfo/linux-amlogic
+ "> linux-amlogic@lists.infradead.org\n"
+ "> http://lists.infradead.org/mailman/listinfo/linux-amlogic\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
 
-7e0bda2898814cf195312fb8d1c18bcf529a8cb919cf94f0668215a6fca6251f
+0637344b9df1a94cf42b93249c7c3815db133c9f0005d734bc2b9564b1dbd478
