diff for duplicates of <20170411142456.GB6821@red-moon>

diff --git a/a/1.txt b/N1/1.txt
index f72fe7d..89adb88 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,7 @@
 On Tue, Apr 11, 2017 at 11:38:48PM +1000, Benjamin Herrenschmidt wrote:
 > On Tue, 2017-04-11 at 13:29 +0100, Lorenzo Pieralisi wrote:
-> > The PCI specifications (Rev 3.0, 3.2.5 "Transaction Ordering and Posting")
+> > The PCI specifications (Rev 3.0, 3.2.5 "Transaction Ordering and Postin=
+g")
 > > mandate non-posted configuration transactions. As further highlighted in
 > > the PCIe specifications (4.0 - Rev0.3, "Ordering Considerations for the
 > > Enhanced Configuration Access Mechanism"), through ECAM and
@@ -11,11 +12,13 @@ On Tue, Apr 11, 2017 at 11:38:48PM +1000, Benjamin Herrenschmidt wrote:
 > > enforce through virtual address mapping non-posted write transactions
 > > behaviour) but writes to Configuration Space are not posted on the PCI
 > > express fabric.
-> > 
+> > =
+
 > > Include the asm-generic ioremap_nopost() implementation (currently
 > > falling back to ioremap_nocache()) to provide a non-posted writes
 > > ioremap interface to kernel subsystems.
-> 
+> =
+
 > NAK. As explained in my reply to patch 0.
 
 Ok, point taken. BTW, may I ask you guys to have a look into this
@@ -35,18 +38,27 @@ Lorenzo
 > > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 > > > Cc: Paul Mackerras <paulus@samba.org>
 > > ---
-> >  arch/powerpc/include/asm/io.h | 1 +
-> >  1 file changed, 1 insertion(+)
-> > 
-> > diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
+> > =A0arch/powerpc/include/asm/io.h | 1 +
+> > =A01 file changed, 1 insertion(+)
+> > =
+
+> > diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/i=
+o.h
 > > index 5ed2924..6dcd0e2 100644
 > > --- a/arch/powerpc/include/asm/io.h
 > > +++ b/arch/powerpc/include/asm/io.h
-> > @@ -757,6 +757,7 @@ extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size,
-> >  extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);
-> > >  #define ioremap_nocache(addr, size)	ioremap((addr), (size))
-> > >  #define ioremap_uc(addr, size)		ioremap((addr), (size))
+> > @@ -757,6 +757,7 @@ extern void __iomem *ioremap_prot(phys_addr_t addre=
+ss, unsigned long size,
+> > =A0extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long s=
+ize);
+> > > =A0#define ioremap_nocache(addr, size)	ioremap((addr), (size))
+> > > =A0#define ioremap_uc(addr, size)		ioremap((addr), (size))
 > > +#include <asm-generic/ioremap-nopost.h>
-> >  
-> >  extern void iounmap(volatile void __iomem *addr);
-> >
+> > =A0
+> > =A0extern void iounmap(volatile void __iomem *addr);
+> > =A0
+
+_______________________________________________
+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 e71bcd2..c0e3b3a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,18 +5,19 @@
  "Subject\0Re: [PATCH v3 21/32] powerpc: include default ioremap_nopost() implementation\0"
  "Date\0Tue, 11 Apr 2017 15:24:56 +0100\0"
  "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0"
- "Cc\0linux-pci@vger.kernel.org"
-  linux-arch@vger.kernel.org
+ "Cc\0linux-arch@vger.kernel.org"
+  linux-pci@vger.kernel.org
   linux-kernel@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
+  Paul Mackerras <paulus@samba.org>
   Michael Ellerman <mpe@ellerman.id.au>
   Bjorn Helgaas <bhelgaas@google.com>
- " Paul Mackerras <paulus@samba.org>\0"
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, Apr 11, 2017 at 11:38:48PM +1000, Benjamin Herrenschmidt wrote:\n"
  "> On Tue, 2017-04-11 at 13:29 +0100, Lorenzo Pieralisi wrote:\n"
- "> > The PCI specifications (Rev 3.0, 3.2.5 \"Transaction Ordering and Posting\")\n"
+ "> > The PCI specifications (Rev 3.0, 3.2.5 \"Transaction Ordering and Postin=\n"
+ "g\")\n"
  "> > mandate non-posted configuration transactions. As further highlighted in\n"
  "> > the PCIe specifications (4.0 - Rev0.3, \"Ordering Considerations for the\n"
  "> > Enhanced Configuration Access Mechanism\"), through ECAM and\n"
@@ -27,11 +28,13 @@
  "> > enforce through virtual address mapping non-posted write transactions\n"
  "> > behaviour) but writes to Configuration Space are not posted on the PCI\n"
  "> > express fabric.\n"
- "> > \n"
+ "> > =\n"
+ "\n"
  "> > Include the asm-generic ioremap_nopost() implementation (currently\n"
  "> > falling back to ioremap_nocache()) to provide a non-posted writes\n"
  "> > ioremap interface to kernel subsystems.\n"
- "> \n"
+ "> =\n"
+ "\n"
  "> NAK. As explained in my reply to patch 0.\n"
  "\n"
  "Ok, point taken. BTW, may I ask you guys to have a look into this\n"
@@ -51,20 +54,29 @@
  "> > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>\n"
  "> > > Cc: Paul Mackerras <paulus@samba.org>\n"
  "> > ---\n"
- "> > \302\240arch/powerpc/include/asm/io.h | 1 +\n"
- "> > \302\2401 file changed, 1 insertion(+)\n"
- "> > \n"
- "> > diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h\n"
+ "> > =A0arch/powerpc/include/asm/io.h | 1 +\n"
+ "> > =A01 file changed, 1 insertion(+)\n"
+ "> > =\n"
+ "\n"
+ "> > diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/i=\n"
+ "o.h\n"
  "> > index 5ed2924..6dcd0e2 100644\n"
  "> > --- a/arch/powerpc/include/asm/io.h\n"
  "> > +++ b/arch/powerpc/include/asm/io.h\n"
- "> > @@ -757,6 +757,7 @@ extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size,\n"
- "> > \302\240extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);\n"
- "> > > \302\240#define ioremap_nocache(addr, size)\tioremap((addr), (size))\n"
- "> > > \302\240#define ioremap_uc(addr, size)\t\tioremap((addr), (size))\n"
+ "> > @@ -757,6 +757,7 @@ extern void __iomem *ioremap_prot(phys_addr_t addre=\n"
+ "ss, unsigned long size,\n"
+ "> > =A0extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long s=\n"
+ "ize);\n"
+ "> > > =A0#define ioremap_nocache(addr, size)\tioremap((addr), (size))\n"
+ "> > > =A0#define ioremap_uc(addr, size)\t\tioremap((addr), (size))\n"
  "> > +#include <asm-generic/ioremap-nopost.h>\n"
- "> > \302\240\n"
- "> > \302\240extern void iounmap(volatile void __iomem *addr);\n"
- > >
+ "> > =A0\n"
+ "> > =A0extern void iounmap(volatile void __iomem *addr);\n"
+ "> > =A0\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
 
-50c8dc07d713e0b5c12dabfccc13df3a1a6ce41a89dce01ed4b71b7e82671448
+9294ef1b67cbaba4c09964f518720c29581693030e40b753610bcf86422473e3
