diff for duplicates of <587C58A3.7080600@ti.com>

diff --git a/a/1.txt b/N1/1.txt
index ccf704b..fee5dd2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,8 +2,9 @@ Hi Joao,
 
 On Friday 13 January 2017 11:20 PM, Joao Pinto wrote:
 > Hi Kishon,
-> 
-> Às 10:26 AM de 1/12/2017, Kishon Vijay Abraham I escreveu:
+> =
+
+> =C0s 10:26 AM de 1/12/2017, Kishon Vijay Abraham I escreveu:
 >> Now that pci designware host has a separate file, create a new
 >> config symbol to select the host only driver. This is in preparation
 >> to enable endpoint support to designware driver.
@@ -15,9 +16,12 @@ On Friday 13 January 2017 11:20 PM, Joao Pinto wrote:
 >>  drivers/pci/dwc/pcie-designware.h |   29 +++++++++++++++++++++++++----
 >>  3 files changed, 42 insertions(+), 16 deletions(-)
 >>
-> 
-> You are already working in a base where dwc/ already exists. I know you made a
-> rename / re-structure patch for pci, but I think it was not yet accepted, right?
+> =
+
+> You are already working in a base where dwc/ already exists. I know you m=
+ade a
+> rename / re-structure patch for pci, but I think it was not yet accepted,=
+ right?
 > I don't see it in any of Bjorn' dev branches.
 
 He said he'll merge that a little later.
@@ -25,15 +29,18 @@ He said he'll merge that a little later.
 Thanks
 Kishon
 
-> 
+> =
+
 > Thanks.
-> 
+> =
+
 >> diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
 >> index 8b08519..d0bdfb5 100644
 >> --- a/drivers/pci/dwc/Kconfig
 >> +++ b/drivers/pci/dwc/Kconfig
 >> @@ -3,13 +3,17 @@ menu "DesignWare PCI Core Support"
->>  
+>>  =
+
 >>  config PCIE_DW
 >>  	bool
 >> +
@@ -41,7 +48,8 @@ Kishon
 >> +        bool
 >>  	depends on PCI_MSI_IRQ_DOMAIN
 >> +        select PCIE_DW
->>  
+>>  =
+
 >>  config PCI_DRA7XX
 >>  	bool "TI DRA7xx PCIe controller"
 >>  	depends on OF && HAS_IOMEM && TI_PIPE3
@@ -66,7 +74,8 @@ Kishon
 >>  	select PCIEPORTBUS
 >> -	select PCIE_DW
 >> +	select PCIE_DW_HOST
->>  
+>>  =
+
 >>  config PCI_IMX6
 >>  	bool "Freescale i.MX6 PCIe controller"
 >>  	depends on SOC_IMX6Q || COMPILE_TEST
@@ -74,7 +83,8 @@ Kishon
 >>  	select PCIEPORTBUS
 >> -	select PCIE_DW
 >> +	select PCIE_DW_HOST
->>  
+>>  =
+
 >>  config PCIE_SPEAR13XX
 >>  	bool "STMicroelectronics SPEAr PCIe controller"
 >>  	depends on ARCH_SPEAR13XX || COMPILE_TEST
@@ -84,7 +94,8 @@ Kishon
 >> +	select PCIE_DW_HOST
 >>  	help
 >>  	  Say Y here if you want PCIe support on SPEAr13XX SoCs.
->>  
+>>  =
+
 >> @@ -55,7 +59,7 @@ config PCI_KEYSTONE
 >>  	depends on ARCH_KEYSTONE || COMPILE_TEST
 >>  	depends on PCI_MSI_IRQ_DOMAIN
@@ -102,7 +113,8 @@ Kishon
 >> +	select PCIE_DW_HOST
 >>  	help
 >>  	  Say Y here if you want PCIe controller support on Layerscape SoCs.
->>  
+>>  =
+
 >> @@ -76,7 +80,7 @@ config PCI_HISI
 >>  	bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
 >>  	depends on PCI_MSI_IRQ_DOMAIN
@@ -144,28 +156,32 @@ Kishon
 >> --- a/drivers/pci/dwc/Makefile
 >> +++ b/drivers/pci/dwc/Makefile
 >> @@ -1,4 +1,5 @@
->> -obj-$(CONFIG_PCIE_DW) += pcie-designware.o pcie-designware-host.o
->> +obj-$(CONFIG_PCIE_DW) += pcie-designware.o
->> +obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o
->>  obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o
->>  obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
->>  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
->> diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h
+>> -obj-$(CONFIG_PCIE_DW) +=3D pcie-designware.o pcie-designware-host.o
+>> +obj-$(CONFIG_PCIE_DW) +=3D pcie-designware.o
+>> +obj-$(CONFIG_PCIE_DW_HOST) +=3D pcie-designware-host.o
+>>  obj-$(CONFIG_PCIE_DW_PLAT) +=3D pcie-designware-plat.o
+>>  obj-$(CONFIG_PCI_DRA7XX) +=3D pci-dra7xx.o
+>>  obj-$(CONFIG_PCI_EXYNOS) +=3D pci-exynos.o
+>> diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-de=
+signware.h
 >> index 808d17b..8f3dcb2 100644
 >> --- a/drivers/pci/dwc/pcie-designware.h
 >> +++ b/drivers/pci/dwc/pcie-designware.h
 >> @@ -162,10 +162,6 @@ struct dw_pcie {
->>  
+>>  =
+
 >>  int dw_pcie_read(void __iomem *addr, int size, u32 *val);
 >>  int dw_pcie_write(void __iomem *addr, int size, u32 val);
 >> -irqreturn_t dw_handle_msi_irq(struct pcie_port *pp);
 >> -void dw_pcie_msi_init(struct pcie_port *pp);
 >> -void dw_pcie_setup_rc(struct pcie_port *pp);
 >> -int dw_pcie_host_init(struct pcie_port *pp);
->>  
+>>  =
+
 >>  u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg);
 >>  void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val);
->> @@ -175,4 +171,29 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index,
+>> @@ -175,4 +171,29 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci,=
+ int index,
 >>  			       int type, u64 cpu_addr, u64 pci_addr,
 >>  			       u32 size);
 >>  void dw_pcie_setup(struct dw_pcie *pci);
@@ -196,4 +212,10 @@ Kishon
 >> +#endif
 >>  #endif /* _PCIE_DESIGNWARE_H */
 >>
->
+> =
+
+
+_______________________________________________
+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 4816a8e..bec854f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,25 +8,26 @@
   Bjorn Helgaas <bhelgaas@google.com>
   Jingoo Han <jingoohan1@gmail.com>
  " Arnd Bergmann <arnd@arndb.de>\0"
- "Cc\0linux-pci@vger.kernel.org"
+ "Cc\0devicetree@vger.kernel.org"
+  linux-samsung-soc@vger.kernel.org
   linux-doc@vger.kernel.org
+  linux-pci@vger.kernel.org
+  nsekhar@ti.com
   linux-kernel@vger.kernel.org
-  devicetree@vger.kernel.org
-  linux-omap@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
-  linux-samsung-soc@vger.kernel.org
-  linuxppc-dev@lists.ozlabs.org
   linux-arm-kernel@axis.com
   linux-arm-msm@vger.kernel.org
- " nsekhar@ti.com\0"
+  linux-omap@vger.kernel.org
+  linuxppc-dev@lists.ozlabs.org
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Joao,\n"
  "\n"
  "On Friday 13 January 2017 11:20 PM, Joao Pinto wrote:\n"
  "> Hi Kishon,\n"
- "> \n"
- "> \303\200s 10:26 AM de 1/12/2017, Kishon Vijay Abraham I escreveu:\n"
+ "> =\n"
+ "\n"
+ "> =C0s 10:26 AM de 1/12/2017, Kishon Vijay Abraham I escreveu:\n"
  ">> Now that pci designware host has a separate file, create a new\n"
  ">> config symbol to select the host only driver. This is in preparation\n"
  ">> to enable endpoint support to designware driver.\n"
@@ -38,9 +39,12 @@
  ">>  drivers/pci/dwc/pcie-designware.h |   29 +++++++++++++++++++++++++----\n"
  ">>  3 files changed, 42 insertions(+), 16 deletions(-)\n"
  ">>\n"
- "> \n"
- "> You are already working in a base where dwc/ already exists. I know you made a\n"
- "> rename / re-structure patch for pci, but I think it was not yet accepted, right?\n"
+ "> =\n"
+ "\n"
+ "> You are already working in a base where dwc/ already exists. I know you m=\n"
+ "ade a\n"
+ "> rename / re-structure patch for pci, but I think it was not yet accepted,=\n"
+ " right?\n"
  "> I don't see it in any of Bjorn' dev branches.\n"
  "\n"
  "He said he'll merge that a little later.\n"
@@ -48,15 +52,18 @@
  "Thanks\n"
  "Kishon\n"
  "\n"
- "> \n"
+ "> =\n"
+ "\n"
  "> Thanks.\n"
- "> \n"
+ "> =\n"
+ "\n"
  ">> diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig\n"
  ">> index 8b08519..d0bdfb5 100644\n"
  ">> --- a/drivers/pci/dwc/Kconfig\n"
  ">> +++ b/drivers/pci/dwc/Kconfig\n"
  ">> @@ -3,13 +3,17 @@ menu \"DesignWare PCI Core Support\"\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">>  config PCIE_DW\n"
  ">>  \tbool\n"
  ">> +\n"
@@ -64,7 +71,8 @@
  ">> +        bool\n"
  ">>  \tdepends on PCI_MSI_IRQ_DOMAIN\n"
  ">> +        select PCIE_DW\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">>  config PCI_DRA7XX\n"
  ">>  \tbool \"TI DRA7xx PCIe controller\"\n"
  ">>  \tdepends on OF && HAS_IOMEM && TI_PIPE3\n"
@@ -89,7 +97,8 @@
  ">>  \tselect PCIEPORTBUS\n"
  ">> -\tselect PCIE_DW\n"
  ">> +\tselect PCIE_DW_HOST\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">>  config PCI_IMX6\n"
  ">>  \tbool \"Freescale i.MX6 PCIe controller\"\n"
  ">>  \tdepends on SOC_IMX6Q || COMPILE_TEST\n"
@@ -97,7 +106,8 @@
  ">>  \tselect PCIEPORTBUS\n"
  ">> -\tselect PCIE_DW\n"
  ">> +\tselect PCIE_DW_HOST\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">>  config PCIE_SPEAR13XX\n"
  ">>  \tbool \"STMicroelectronics SPEAr PCIe controller\"\n"
  ">>  \tdepends on ARCH_SPEAR13XX || COMPILE_TEST\n"
@@ -107,7 +117,8 @@
  ">> +\tselect PCIE_DW_HOST\n"
  ">>  \thelp\n"
  ">>  \t  Say Y here if you want PCIe support on SPEAr13XX SoCs.\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">> @@ -55,7 +59,7 @@ config PCI_KEYSTONE\n"
  ">>  \tdepends on ARCH_KEYSTONE || COMPILE_TEST\n"
  ">>  \tdepends on PCI_MSI_IRQ_DOMAIN\n"
@@ -125,7 +136,8 @@
  ">> +\tselect PCIE_DW_HOST\n"
  ">>  \thelp\n"
  ">>  \t  Say Y here if you want PCIe controller support on Layerscape SoCs.\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">> @@ -76,7 +80,7 @@ config PCI_HISI\n"
  ">>  \tbool \"HiSilicon Hip05 and Hip06 SoCs PCIe controllers\"\n"
  ">>  \tdepends on PCI_MSI_IRQ_DOMAIN\n"
@@ -167,28 +179,32 @@
  ">> --- a/drivers/pci/dwc/Makefile\n"
  ">> +++ b/drivers/pci/dwc/Makefile\n"
  ">> @@ -1,4 +1,5 @@\n"
- ">> -obj-$(CONFIG_PCIE_DW) += pcie-designware.o pcie-designware-host.o\n"
- ">> +obj-$(CONFIG_PCIE_DW) += pcie-designware.o\n"
- ">> +obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o\n"
- ">>  obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o\n"
- ">>  obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o\n"
- ">>  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o\n"
- ">> diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h\n"
+ ">> -obj-$(CONFIG_PCIE_DW) +=3D pcie-designware.o pcie-designware-host.o\n"
+ ">> +obj-$(CONFIG_PCIE_DW) +=3D pcie-designware.o\n"
+ ">> +obj-$(CONFIG_PCIE_DW_HOST) +=3D pcie-designware-host.o\n"
+ ">>  obj-$(CONFIG_PCIE_DW_PLAT) +=3D pcie-designware-plat.o\n"
+ ">>  obj-$(CONFIG_PCI_DRA7XX) +=3D pci-dra7xx.o\n"
+ ">>  obj-$(CONFIG_PCI_EXYNOS) +=3D pci-exynos.o\n"
+ ">> diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-de=\n"
+ "signware.h\n"
  ">> index 808d17b..8f3dcb2 100644\n"
  ">> --- a/drivers/pci/dwc/pcie-designware.h\n"
  ">> +++ b/drivers/pci/dwc/pcie-designware.h\n"
  ">> @@ -162,10 +162,6 @@ struct dw_pcie {\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">>  int dw_pcie_read(void __iomem *addr, int size, u32 *val);\n"
  ">>  int dw_pcie_write(void __iomem *addr, int size, u32 val);\n"
  ">> -irqreturn_t dw_handle_msi_irq(struct pcie_port *pp);\n"
  ">> -void dw_pcie_msi_init(struct pcie_port *pp);\n"
  ">> -void dw_pcie_setup_rc(struct pcie_port *pp);\n"
  ">> -int dw_pcie_host_init(struct pcie_port *pp);\n"
- ">>  \n"
+ ">>  =\n"
+ "\n"
  ">>  u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg);\n"
  ">>  void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val);\n"
- ">> @@ -175,4 +171,29 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index,\n"
+ ">> @@ -175,4 +171,29 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci,=\n"
+ " int index,\n"
  ">>  \t\t\t       int type, u64 cpu_addr, u64 pci_addr,\n"
  ">>  \t\t\t       u32 size);\n"
  ">>  void dw_pcie_setup(struct dw_pcie *pci);\n"
@@ -219,6 +235,12 @@
  ">> +#endif\n"
  ">>  #endif /* _PCIE_DESIGNWARE_H */\n"
  ">>\n"
- >
+ "> =\n"
+ "\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
 
-b7a6fd4b8c0a2d62bd4be6b424ff70681e6398e783ead6c8dd7d85e511834d9d
+b938fae0cbdca432e69cef9a43523eac45dcbc609ca102dcde5eb2fa738c1ae1
