diff for duplicates of <20170508161339.GA12665@collabora.com>

diff --git a/a/1.txt b/N1/1.txt
index 07cccff..d659440 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ On Mon, May 08, 2017 at 09:09:32PM +0530, Kishon Vijay Abraham I wrote:
 <snip>
 .
 .
-> > [    0.501998] OF: PCI: host bridge /soc/pcie@1ffc000 ranges:
+> > [    0.501998] OF: PCI: host bridge /soc/pcie at 1ffc000 ranges:
 > > [    0.507275] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000
 > > [    0.513202] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000
 > > [    0.739697] imx6q-pcie 1ffc000.pcie: link up
@@ -155,7 +155,7 @@ Starting kernel ...
 
 Uncompressing Linux... done, booting the kernel.
 [    0.000000] Booting Linux on physical CPU 0x0
-[    0.000000] Linux version 4.10.0-rc1-00012-g40f67fb-dirty (peter@lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (7
+[    0.000000] Linux version 4.10.0-rc1-00012-g40f67fb-dirty (peter at lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (7
 [    0.000000] CPU: ARMv7 Processor [412fc09a] revision 10 (ARMv7), cr=10c5387d
 [    0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache
 [    0.000000] OF: fdt:Machine model: General Electric B850v3
@@ -173,7 +173,7 @@ Uncompressing Linux... done, booting the kernel.
 [    0.000000] pcpu-alloc: s28876 r8192 d24372 u61440 alloc=15*4096
 [    0.000000] pcpu-alloc: [0] 0 [0] 1 
 [    0.000000] Built 1 zonelists in Zone order, mobility grouping on.  Total pages: 520704
-[    0.000000] Kernel command line: root=/dev/mmcblk0p2 ro rootwait cma=128M video=DP-1:1024x768@60 video=HDMI-A-1:1024x768@60 earlycon logl0
+[    0.000000] Kernel command line: root=/dev/mmcblk0p2 ro rootwait cma=128M video=DP-1:1024x768 at 60 video=HDMI-A-1:1024x768 at 60 earlycon logl0
 [    0.000000] PID hash table entries: 4096 (order: 2, 16384 bytes)
 [    0.000000] Dentry cache hash table entries: 262144 (order: 8, 1048576 bytes)
 [    0.000000] Inode-cache hash table entries: 131072 (order: 7, 524288 bytes)
@@ -266,8 +266,8 @@ Uncompressing Linux... done, booting the kernel.
 [    0.472676] io scheduler cfq registered (default)
 [    0.477737] imx-weim 21b8000.weim: Invalid 'ranges' configuration
 [    0.483352] imx-weim: probe of 21b8000.weim failed with error -22
-[    0.490619] OF: PCI: host bridge /soc/pcie@0x01000000 ranges:
-[    0.495163] OF: PCI:   No bus range found for /soc/pcie@0x01000000, using [bus 00-ff]
+[    0.490619] OF: PCI: host bridge /soc/pcie at 0x01000000 ranges:
+[    0.495163] OF: PCI:   No bus range found for /soc/pcie at 0x01000000, using [bus 00-ff]
 [    0.503027] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000
 [    0.508927] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000
 [    0.735447] imx6q-pcie 1ffc000.pcie: link up
@@ -368,8 +368,3 @@ Uncompressing Linux... done, booting the kernel.
 [    1.354637] pcieport 0000:02:01.0: enabling device (0140 -> 0143)
 [    1.360799] pcieport 0000:02:02.0: enabling device (0140 -> 0143)
 ...
-
-_______________________________________________
-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 3cfcd1d..514595f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,28 +1,9 @@
  "ref\020170508150224.GA7458@collabora.com\0"
  "ref\0967686bf-5f1b-29aa-ee2f-b976addbe98f@ti.com\0"
- "From\0Peter Senna Tschudin <peter.senna@collabora.com>\0"
- "Subject\0Re: Regression: 442ec4c04d1: PCI: dwc: all: Split struct pcie_port into host-only and core structures\0"
+ "From\0peter.senna@collabora.com (Peter Senna Tschudin)\0"
+ "Subject\0Regression: 442ec4c04d1: PCI: dwc: all: Split struct pcie_port into host-only and core structures\0"
  "Date\0Mon, 8 May 2017 18:13:39 +0200\0"
- "To\0Kishon Vijay Abraham I <kishon@ti.com>\0"
- "Cc\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"
-  Jesper Nilsson <jesper.nilsson@axis.com>
-  Joao Pinto <Joao.Pinto@synopsys.com>
-  Richard Zhu <hongxing.zhu@nxp.com>
-  Gabriele Paoloni <gabriele.paoloni@huawei.com>
-  Jingoo Han <jingoohan1@gmail.com>
-  Pratyush Anand <pratyush.anand@gmail.com>
-  linux-pci@vger.kernel.org
-  linux-kernel@vger.kernel.org
-  Stanimir Varbanov <svarbanov@mm-sol.com>
-  Minghuan Lian <minghuan.Lian@freescale.com>
-  Zhou Wang <wangzhou1@hisilicon.com>
-  Murali Karicheri <m-karicheri2@ti.com>
-  Niklas Cassel <niklas.cassel@axis.com>
-  Bjorn Helgaas <bhelgaas@google.com>
-  Mingkai Hu <mingkai.hu@freescale.com>
-  Roy Zang <tie-fei.zang@freescale.com>
-  linux-arm-kernel@lists.infradead.org
- " Lucas Stach <l.stach@pengutronix.de>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, May 08, 2017 at 09:09:32PM +0530, Kishon Vijay Abraham I wrote:\n"
@@ -31,7 +12,7 @@
  "<snip>\n"
  ".\n"
  ".\n"
- "> > [    0.501998] OF: PCI: host bridge /soc/pcie@1ffc000 ranges:\n"
+ "> > [    0.501998] OF: PCI: host bridge /soc/pcie at 1ffc000 ranges:\n"
  "> > [    0.507275] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000\n"
  "> > [    0.513202] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000\n"
  "> > [    0.739697] imx6q-pcie 1ffc000.pcie: link up\n"
@@ -182,7 +163,7 @@
  "\n"
  "Uncompressing Linux... done, booting the kernel.\n"
  "[    0.000000] Booting Linux on physical CPU 0x0\n"
- "[    0.000000] Linux version 4.10.0-rc1-00012-g40f67fb-dirty (peter@lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (7\n"
+ "[    0.000000] Linux version 4.10.0-rc1-00012-g40f67fb-dirty (peter at lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (7\n"
  "[    0.000000] CPU: ARMv7 Processor [412fc09a] revision 10 (ARMv7), cr=10c5387d\n"
  "[    0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache\n"
  "[    0.000000] OF: fdt:Machine model: General Electric B850v3\n"
@@ -200,7 +181,7 @@
  "[    0.000000] pcpu-alloc: s28876 r8192 d24372 u61440 alloc=15*4096\n"
  "[    0.000000] pcpu-alloc: [0] 0 [0] 1 \n"
  "[    0.000000] Built 1 zonelists in Zone order, mobility grouping on.  Total pages: 520704\n"
- "[    0.000000] Kernel command line: root=/dev/mmcblk0p2 ro rootwait cma=128M video=DP-1:1024x768@60 video=HDMI-A-1:1024x768@60 earlycon logl0\n"
+ "[    0.000000] Kernel command line: root=/dev/mmcblk0p2 ro rootwait cma=128M video=DP-1:1024x768 at 60 video=HDMI-A-1:1024x768 at 60 earlycon logl0\n"
  "[    0.000000] PID hash table entries: 4096 (order: 2, 16384 bytes)\n"
  "[    0.000000] Dentry cache hash table entries: 262144 (order: 8, 1048576 bytes)\n"
  "[    0.000000] Inode-cache hash table entries: 131072 (order: 7, 524288 bytes)\n"
@@ -293,8 +274,8 @@
  "[    0.472676] io scheduler cfq registered (default)\n"
  "[    0.477737] imx-weim 21b8000.weim: Invalid 'ranges' configuration\n"
  "[    0.483352] imx-weim: probe of 21b8000.weim failed with error -22\n"
- "[    0.490619] OF: PCI: host bridge /soc/pcie@0x01000000 ranges:\n"
- "[    0.495163] OF: PCI:   No bus range found for /soc/pcie@0x01000000, using [bus 00-ff]\n"
+ "[    0.490619] OF: PCI: host bridge /soc/pcie at 0x01000000 ranges:\n"
+ "[    0.495163] OF: PCI:   No bus range found for /soc/pcie at 0x01000000, using [bus 00-ff]\n"
  "[    0.503027] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000\n"
  "[    0.508927] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000\n"
  "[    0.735447] imx6q-pcie 1ffc000.pcie: link up\n"
@@ -394,11 +375,6 @@
  "[    1.347920] pcieport 0000:01:00.0: enabling device (0140 -> 0143)\n"
  "[    1.354637] pcieport 0000:02:01.0: enabling device (0140 -> 0143)\n"
  "[    1.360799] pcieport 0000:02:02.0: enabling device (0140 -> 0143)\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
+ ...
 
-a3d067b67107756a2c66f0e80f4494cbfdab5d8cfa485f5a0bb03e3c7e177e51
+fdd42f82db2d15b061fd816844f6b1bb694012b1bd5f7277d3f80e4283b87e97
