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

diff --git a/a/1.txt b/N1/1.txt
index 42bebfa..30e82fe 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,8 +1,8 @@
 On Tue, 2017-03-28 at 20:18 +0200, Helmut Klein wrote:
-> i know for sure that the bluetooth chip of my system is connected to?
+> i know for sure that the bluetooth chip of my system is connected to 
 > uart_A. so this clock must be exposed.
 > 
-> i don't know if the other 2 uarts are used on other hardware. so i will?
+> i don't know if the other 2 uarts are used on other hardware. so i will 
 > remove them from my patch.
 
 What I meant is device trees "upstream". 
@@ -30,68 +30,68 @@ Jerome
 > > > 
 > > > Signed-off-by: Helmut Klein <hgkr.klein@gmail.com>
 > > > ---
-> > > ?drivers/clk/meson/gxbb.h??????????????| 6 +++---
-> > > ?include/dt-bindings/clock/gxbb-clkc.h | 3 +++
-> > > ?2 files changed, 6 insertions(+), 3 deletions(-)
+> > >  drivers/clk/meson/gxbb.h              | 6 +++---
+> > >  include/dt-bindings/clock/gxbb-clkc.h | 3 +++
+> > >  2 files changed, 6 insertions(+), 3 deletions(-)
 > > > 
 > > > diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h
 > > > index 8ee2022ce5d5..1edfaa5fe307 100644
 > > > --- a/drivers/clk/meson/gxbb.h
 > > > +++ b/drivers/clk/meson/gxbb.h
 > > > @@ -194,7 +194,7 @@
-> > > ?/* #define CLKID_SAR_ADC */
-> > > ?#define CLKID_SMART_CARD	??24
-> > > ?#define CLKID_RNG0		??25
-> > > -#define CLKID_UART0		??26
+> > >  /* #define CLKID_SAR_ADC */
+> > >  #define CLKID_SMART_CARD	  24
+> > >  #define CLKID_RNG0		  25
+> > > -#define CLKID_UART0		  26
 > > > +/* CLKID_UART0 */
-> > > ?#define CLKID_SDHC		??27
-> > > ?#define CLKID_STREAM		??28
-> > > ?#define CLKID_ASYNC_FIFO	??29
+> > >  #define CLKID_SDHC		  27
+> > >  #define CLKID_STREAM		  28
+> > >  #define CLKID_ASYNC_FIFO	  29
 > > > @@ -216,7 +216,7 @@
-> > > ?#define CLKID_ADC		??45
-> > > ?#define CLKID_BLKMV		??46
-> > > ?#define CLKID_AIU		??47
-> > > -#define CLKID_UART1		??48
+> > >  #define CLKID_ADC		  45
+> > >  #define CLKID_BLKMV		  46
+> > >  #define CLKID_AIU		  47
+> > > -#define CLKID_UART1		  48
 > > > +/* CLKID_UART1 */
-> > > ?#define CLKID_G2D		??49
-> > > ?/* CLKID_USB0 */
-> > > ?/* CLKID_USB1 */
+> > >  #define CLKID_G2D		  49
+> > >  /* CLKID_USB0 */
+> > >  /* CLKID_USB1 */
 > > > @@ -236,7 +236,7 @@
-> > > ?/* CLKID_USB0_DDR_BRIDGE */
-> > > ?#define CLKID_MMC_PCLK		??66
-> > > ?#define CLKID_DVIN		??67
-> > > -#define CLKID_UART2		??68
+> > >  /* CLKID_USB0_DDR_BRIDGE */
+> > >  #define CLKID_MMC_PCLK		  66
+> > >  #define CLKID_DVIN		  67
+> > > -#define CLKID_UART2		  68
 > > > +/* CLKID_UART2 */
-> > > ?/* #define CLKID_SANA */
-> > > ?#define CLKID_VPU_INTR		??70
-> > > ?#define CLKID_SEC_AHB_AHB3_BRIDGE 71
+> > >  /* #define CLKID_SANA */
+> > >  #define CLKID_VPU_INTR		  70
+> > >  #define CLKID_SEC_AHB_AHB3_BRIDGE 71
 > > > diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-
 > > > bindings/clock/gxbb-clkc.h
 > > > index 692846c7941b..7b329df47752 100644
 > > > --- a/include/dt-bindings/clock/gxbb-clkc.h
 > > > +++ b/include/dt-bindings/clock/gxbb-clkc.h
 > > > @@ -15,13 +15,16 @@
-> > > ?#define CLKID_SPI		34
-> > > ?#define CLKID_I2C		22
-> > > ?#define CLKID_SAR_ADC		23
+> > >  #define CLKID_SPI		34
+> > >  #define CLKID_I2C		22
+> > >  #define CLKID_SAR_ADC		23
 > > > +#define CLKID_UART0		26
-> > > ?#define CLKID_ETH		36
+> > >  #define CLKID_ETH		36
 > > > +#define CLKID_UART1		48
-> > > ?#define CLKID_USB0		50
-> > > ?#define CLKID_USB1		51
-> > > ?#define CLKID_USB		55
-> > > ?#define CLKID_HDMI_PCLK		63
-> > > ?#define CLKID_USB1_DDR_BRIDGE	64
-> > > ?#define CLKID_USB0_DDR_BRIDGE	65
+> > >  #define CLKID_USB0		50
+> > >  #define CLKID_USB1		51
+> > >  #define CLKID_USB		55
+> > >  #define CLKID_HDMI_PCLK		63
+> > >  #define CLKID_USB1_DDR_BRIDGE	64
+> > >  #define CLKID_USB0_DDR_BRIDGE	65
 > > > +#define CLKID_UART2		68
-> > > ?#define CLKID_SANA		69
-> > > ?#define CLKID_GCLK_VENCI_INT0	77
-> > > ?#define CLKID_AO_I2C		93
+> > >  #define CLKID_SANA		69
+> > >  #define CLKID_GCLK_VENCI_INT0	77
+> > >  #define CLKID_AO_I2C		93
 > > > --
 > > > 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
diff --git a/a/content_digest b/N1/content_digest
index 45bc55c..78ab893 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,17 +2,24 @@
  "ref\020170328092545.4644-2-hgkr.klein@gmail.com\0"
  "ref\01490716277.20764.6.camel@baylibre.com\0"
  "ref\071489b62-78c8-7082-587e-8598dc43ca59@gmail.com\0"
- "From\0jbrunet@baylibre.com (Jerome Brunet)\0"
- "Subject\0[PATCH v2,1/3] meson_uart: expose CLKID_UARTx\0"
+ "From\0Jerome Brunet <jbrunet@baylibre.com>\0"
+ "Subject\0Re: [PATCH v2,1/3] meson_uart: expose CLKID_UARTx\0"
  "Date\0Tue, 28 Mar 2017 21:14:50 +0200\0"
- "To\0linus-amlogic@lists.infradead.org\0"
+ "To\0Helmut Klein <hgkr.klein@gmail.com>"
+  mturquette@baylibre.com
+ " sboyd@codeaurora.org\0"
+ "Cc\0devicetree@vger.kernel.org"
+  linux-kernel@vger.kernel.org
+  linux-amlogic@lists.infradead.org
+  linux-clk@vger.kernel.org
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, 2017-03-28 at 20:18 +0200, Helmut Klein wrote:\n"
- "> i know for sure that the bluetooth chip of my system is connected to?\n"
+ "> i know for sure that the bluetooth chip of my system is connected to\302\240\n"
  "> uart_A. so this clock must be exposed.\n"
  "> \n"
- "> i don't know if the other 2 uarts are used on other hardware. so i will?\n"
+ "> i don't know if the other 2 uarts are used on other hardware. so i will\302\240\n"
  "> remove them from my patch.\n"
  "\n"
  "What I meant is device trees \"upstream\". \n"
@@ -40,70 +47,70 @@
  "> > > \n"
  "> > > Signed-off-by: Helmut Klein <hgkr.klein@gmail.com>\n"
  "> > > ---\n"
- "> > > ?drivers/clk/meson/gxbb.h??????????????| 6 +++---\n"
- "> > > ?include/dt-bindings/clock/gxbb-clkc.h | 3 +++\n"
- "> > > ?2 files changed, 6 insertions(+), 3 deletions(-)\n"
+ "> > > \302\240drivers/clk/meson/gxbb.h\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240| 6 +++---\n"
+ "> > > \302\240include/dt-bindings/clock/gxbb-clkc.h | 3 +++\n"
+ "> > > \302\2402 files changed, 6 insertions(+), 3 deletions(-)\n"
  "> > > \n"
  "> > > diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h\n"
  "> > > index 8ee2022ce5d5..1edfaa5fe307 100644\n"
  "> > > --- a/drivers/clk/meson/gxbb.h\n"
  "> > > +++ b/drivers/clk/meson/gxbb.h\n"
  "> > > @@ -194,7 +194,7 @@\n"
- "> > > ?/* #define CLKID_SAR_ADC */\n"
- "> > > ?#define CLKID_SMART_CARD\t??24\n"
- "> > > ?#define CLKID_RNG0\t\t??25\n"
- "> > > -#define CLKID_UART0\t\t??26\n"
+ "> > > \302\240/* #define CLKID_SAR_ADC */\n"
+ "> > > \302\240#define CLKID_SMART_CARD\t\302\240\302\24024\n"
+ "> > > \302\240#define CLKID_RNG0\t\t\302\240\302\24025\n"
+ "> > > -#define CLKID_UART0\t\t\302\240\302\24026\n"
  "> > > +/* CLKID_UART0 */\n"
- "> > > ?#define CLKID_SDHC\t\t??27\n"
- "> > > ?#define CLKID_STREAM\t\t??28\n"
- "> > > ?#define CLKID_ASYNC_FIFO\t??29\n"
+ "> > > \302\240#define CLKID_SDHC\t\t\302\240\302\24027\n"
+ "> > > \302\240#define CLKID_STREAM\t\t\302\240\302\24028\n"
+ "> > > \302\240#define CLKID_ASYNC_FIFO\t\302\240\302\24029\n"
  "> > > @@ -216,7 +216,7 @@\n"
- "> > > ?#define CLKID_ADC\t\t??45\n"
- "> > > ?#define CLKID_BLKMV\t\t??46\n"
- "> > > ?#define CLKID_AIU\t\t??47\n"
- "> > > -#define CLKID_UART1\t\t??48\n"
+ "> > > \302\240#define CLKID_ADC\t\t\302\240\302\24045\n"
+ "> > > \302\240#define CLKID_BLKMV\t\t\302\240\302\24046\n"
+ "> > > \302\240#define CLKID_AIU\t\t\302\240\302\24047\n"
+ "> > > -#define CLKID_UART1\t\t\302\240\302\24048\n"
  "> > > +/* CLKID_UART1 */\n"
- "> > > ?#define CLKID_G2D\t\t??49\n"
- "> > > ?/* CLKID_USB0 */\n"
- "> > > ?/* CLKID_USB1 */\n"
+ "> > > \302\240#define CLKID_G2D\t\t\302\240\302\24049\n"
+ "> > > \302\240/* CLKID_USB0 */\n"
+ "> > > \302\240/* CLKID_USB1 */\n"
  "> > > @@ -236,7 +236,7 @@\n"
- "> > > ?/* CLKID_USB0_DDR_BRIDGE */\n"
- "> > > ?#define CLKID_MMC_PCLK\t\t??66\n"
- "> > > ?#define CLKID_DVIN\t\t??67\n"
- "> > > -#define CLKID_UART2\t\t??68\n"
+ "> > > \302\240/* CLKID_USB0_DDR_BRIDGE */\n"
+ "> > > \302\240#define CLKID_MMC_PCLK\t\t\302\240\302\24066\n"
+ "> > > \302\240#define CLKID_DVIN\t\t\302\240\302\24067\n"
+ "> > > -#define CLKID_UART2\t\t\302\240\302\24068\n"
  "> > > +/* CLKID_UART2 */\n"
- "> > > ?/* #define CLKID_SANA */\n"
- "> > > ?#define CLKID_VPU_INTR\t\t??70\n"
- "> > > ?#define CLKID_SEC_AHB_AHB3_BRIDGE 71\n"
+ "> > > \302\240/* #define CLKID_SANA */\n"
+ "> > > \302\240#define CLKID_VPU_INTR\t\t\302\240\302\24070\n"
+ "> > > \302\240#define CLKID_SEC_AHB_AHB3_BRIDGE 71\n"
  "> > > diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-\n"
  "> > > bindings/clock/gxbb-clkc.h\n"
  "> > > index 692846c7941b..7b329df47752 100644\n"
  "> > > --- a/include/dt-bindings/clock/gxbb-clkc.h\n"
  "> > > +++ b/include/dt-bindings/clock/gxbb-clkc.h\n"
  "> > > @@ -15,13 +15,16 @@\n"
- "> > > ?#define CLKID_SPI\t\t34\n"
- "> > > ?#define CLKID_I2C\t\t22\n"
- "> > > ?#define CLKID_SAR_ADC\t\t23\n"
+ "> > > \302\240#define CLKID_SPI\t\t34\n"
+ "> > > \302\240#define CLKID_I2C\t\t22\n"
+ "> > > \302\240#define CLKID_SAR_ADC\t\t23\n"
  "> > > +#define CLKID_UART0\t\t26\n"
- "> > > ?#define CLKID_ETH\t\t36\n"
+ "> > > \302\240#define CLKID_ETH\t\t36\n"
  "> > > +#define CLKID_UART1\t\t48\n"
- "> > > ?#define CLKID_USB0\t\t50\n"
- "> > > ?#define CLKID_USB1\t\t51\n"
- "> > > ?#define CLKID_USB\t\t55\n"
- "> > > ?#define CLKID_HDMI_PCLK\t\t63\n"
- "> > > ?#define CLKID_USB1_DDR_BRIDGE\t64\n"
- "> > > ?#define CLKID_USB0_DDR_BRIDGE\t65\n"
+ "> > > \302\240#define CLKID_USB0\t\t50\n"
+ "> > > \302\240#define CLKID_USB1\t\t51\n"
+ "> > > \302\240#define CLKID_USB\t\t55\n"
+ "> > > \302\240#define CLKID_HDMI_PCLK\t\t63\n"
+ "> > > \302\240#define CLKID_USB1_DDR_BRIDGE\t64\n"
+ "> > > \302\240#define CLKID_USB0_DDR_BRIDGE\t65\n"
  "> > > +#define CLKID_UART2\t\t68\n"
- "> > > ?#define CLKID_SANA\t\t69\n"
- "> > > ?#define CLKID_GCLK_VENCI_INT0\t77\n"
- "> > > ?#define CLKID_AO_I2C\t\t93\n"
+ "> > > \302\240#define CLKID_SANA\t\t69\n"
+ "> > > \302\240#define CLKID_GCLK_VENCI_INT0\t77\n"
+ "> > > \302\240#define CLKID_AO_I2C\t\t93\n"
  "> > > --\n"
  "> > > 2.11.0\n"
  "> > > \n"
  "> > > \n"
  "> > > _______________________________________________\n"
  "> > > linux-amlogic mailing list\n"
- "> > > linux-amlogic at lists.infradead.org\n"
+ "> > > linux-amlogic@lists.infradead.org\n"
  > > > http://lists.infradead.org/mailman/listinfo/linux-amlogic
 
-cd1bfcc782bf77360784fa7a832bf564ceca8133580cb7a07b4699192d755651
+676376f3cda5022df9c1e5882c0ccb2de2ccf19a5e369bdb4791222be903529e
