diff for duplicates of <20170509063439.GC9791@collabora.com>

diff --git a/a/1.txt b/N1/1.txt
index c6af39f..bd1c3c4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -63,7 +63,7 @@ Similar as that system freezes on PCI initialization:
 
 	Uncompressing Linux... done, booting the kernel.
 	[    0.000000] Booting Linux on physical CPU 0x0
-	[    0.000000] Linux version 4.11.0-dirty (peter@lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #1
+	[    0.000000] Linux version 4.11.0-dirty (peter at lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #1
 	...
 	[    0.437377] PCI: CLS 0 bytes, default 64
 	[    0.442000] hw perfevents: enabled with armv7_cortex_a9 PMU driver, 7 counters available
@@ -75,8 +75,8 @@ Similar as that system freezes on PCI initialization:
 	[    0.479762] io scheduler deadline registered
 	[    0.484151] io scheduler cfq registered (default)
 	[    0.488699] io scheduler mq-deadline registered
-	[    0.494867] OF: PCI: host bridge /soc/pcie@0x01000000 ranges:
-	[    0.498969] OF: PCI:   No bus range found for /soc/pcie@0x01000000, using [bus 00-ff]
+	[    0.494867] OF: PCI: host bridge /soc/pcie at 0x01000000 ranges:
+	[    0.498969] OF: PCI:   No bus range found for /soc/pcie at 0x01000000, using [bus 00-ff]
 	[    0.506847] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000
 	[    0.512737] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000
 
@@ -108,7 +108,7 @@ Starting kernel ...
 
 Uncompressing Linux... done, booting the kernel.
 [    0.000000] Booting Linux on physical CPU 0x0
-[    0.000000] Linux version 4.11.0-dirty (peter@lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #137 SMP Tue7
+[    0.000000] Linux version 4.11.0-dirty (peter at lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #137 SMP Tue7
 [    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
@@ -126,7 +126,7 @@ Uncompressing Linux... done, booting the kernel.
 [    0.000000] pcpu-alloc: s37132 r8192 d24308 u69632 alloc=17*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)
@@ -219,8 +219,8 @@ Uncompressing Linux... done, booting the kernel.
 [    0.479908] io scheduler deadline registered
 [    0.484295] io scheduler cfq registered (default)
 [    0.488843] io scheduler mq-deadline registered
-[    0.495021] OF: PCI: host bridge /soc/pcie@0x01000000 ranges:
-[    0.499114] OF: PCI:   No bus range found for /soc/pcie@0x01000000, using [bus 00-ff]
+[    0.495021] OF: PCI: host bridge /soc/pcie at 0x01000000 ranges:
+[    0.499114] OF: PCI:   No bus range found for /soc/pcie at 0x01000000, using [bus 00-ff]
 [    0.506994] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000
 [    0.512884] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000
 [    0.520080] DEBUG: imx6_pcie_host_init
@@ -555,8 +555,8 @@ Uncompressing Linux... done, booting the kernel.
 [    3.593565] imx-drm display-subsystem: bound imx-ipuv3-crtc.7 (ops 0x80940bcc)
 [    3.600990] dwhdmi-imx 120000.hdmi: Detected HDMI TX controller v1.30a with HDCP (DWC HDMI 3D TX PHY)
 [    3.610641] imx-drm display-subsystem: bound 120000.hdmi (ops 0x80940d44)
-[    3.617542] /soc/aips-bus@02000000/ldb/lvds-channel@0: could not find display-timings node
-[    3.625839] /soc/aips-bus@02000000/ldb/lvds-channel@0: no timings specified
+[    3.617542] /soc/aips-bus at 02000000/ldb/lvds-channel at 0: could not find display-timings node
+[    3.625839] /soc/aips-bus at 02000000/ldb/lvds-channel at 0: no timings specified
 [    3.632960] imx-ldb 2000000.aips-bus:ldb: dual-channel mode, ignoring second output
 [    3.640643] imx-drm display-subsystem: bound 2000000.aips-bus:ldb (ops 0x809408b0)
 [    3.725015] Console: switching to colour frame buffer device 128x48
@@ -590,8 +590,3 @@ Uncompressing Linux... done, booting the kernel.
 [    4.349641] systemd[1]: systemd 232 running in system mode. (+PAM -AUDIT -SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP -LIBCRYPTSETUP -G)
 [    4.368028] systemd[1]: Detected architecture arm.
 ...
-
-_______________________________________________
-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 fccd2ef..a30b3db 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,30 +1,9 @@
  "ref\020170508150224.GA7458@collabora.com\0"
  "ref\0CAOMZO5DjFxAus3B03Om0xoqxKuY2TkbcjCY1YEUK9s_R8C_DNA@mail.gmail.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\0Tue, 9 May 2017 08:34:39 +0200\0"
- "To\0Fabio Estevam <festevam@gmail.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>
-  Tim Harvey <tharvey@gateworks.com>
-  Pratyush Anand <pratyush.anand@gmail.com>
-  linux-pci@vger.kernel.org <linux-pci@vger.kernel.org>
-  linux-kernel <linux-kernel@vger.kernel.org>
-  Kishon Vijay Abraham I <kishon@ti.com>
-  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 <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 10:30:13PM -0300, Fabio Estevam wrote:\n"
@@ -92,7 +71,7 @@
  "\n"
  "\tUncompressing Linux... done, booting the kernel.\n"
  "\t[    0.000000] Booting Linux on physical CPU 0x0\n"
- "\t[    0.000000] Linux version 4.11.0-dirty (peter@lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #1\n"
+ "\t[    0.000000] Linux version 4.11.0-dirty (peter at lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #1\n"
  "\t...\n"
  "\t[    0.437377] PCI: CLS 0 bytes, default 64\n"
  "\t[    0.442000] hw perfevents: enabled with armv7_cortex_a9 PMU driver, 7 counters available\n"
@@ -104,8 +83,8 @@
  "\t[    0.479762] io scheduler deadline registered\n"
  "\t[    0.484151] io scheduler cfq registered (default)\n"
  "\t[    0.488699] io scheduler mq-deadline registered\n"
- "\t[    0.494867] OF: PCI: host bridge /soc/pcie@0x01000000 ranges:\n"
- "\t[    0.498969] OF: PCI:   No bus range found for /soc/pcie@0x01000000, using [bus 00-ff]\n"
+ "\t[    0.494867] OF: PCI: host bridge /soc/pcie at 0x01000000 ranges:\n"
+ "\t[    0.498969] OF: PCI:   No bus range found for /soc/pcie at 0x01000000, using [bus 00-ff]\n"
  "\t[    0.506847] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000\n"
  "\t[    0.512737] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000\n"
  "\n"
@@ -137,7 +116,7 @@
  "\n"
  "Uncompressing Linux... done, booting the kernel.\n"
  "[    0.000000] Booting Linux on physical CPU 0x0\n"
- "[    0.000000] Linux version 4.11.0-dirty (peter@lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #137 SMP Tue7\n"
+ "[    0.000000] Linux version 4.11.0-dirty (peter at lenovo-peter.home) (gcc version 6.1.1 20160621 (Red Hat Cross 6.1.1-2) (GCC) ) #137 SMP Tue7\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"
@@ -155,7 +134,7 @@
  "[    0.000000] pcpu-alloc: s37132 r8192 d24308 u69632 alloc=17*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"
@@ -248,8 +227,8 @@
  "[    0.479908] io scheduler deadline registered\n"
  "[    0.484295] io scheduler cfq registered (default)\n"
  "[    0.488843] io scheduler mq-deadline registered\n"
- "[    0.495021] OF: PCI: host bridge /soc/pcie@0x01000000 ranges:\n"
- "[    0.499114] OF: PCI:   No bus range found for /soc/pcie@0x01000000, using [bus 00-ff]\n"
+ "[    0.495021] OF: PCI: host bridge /soc/pcie at 0x01000000 ranges:\n"
+ "[    0.499114] OF: PCI:   No bus range found for /soc/pcie at 0x01000000, using [bus 00-ff]\n"
  "[    0.506994] OF: PCI:    IO 0x01f80000..0x01f8ffff -> 0x00000000\n"
  "[    0.512884] OF: PCI:   MEM 0x01000000..0x01efffff -> 0x01000000\n"
  "[    0.520080] DEBUG: imx6_pcie_host_init\n"
@@ -584,8 +563,8 @@
  "[    3.593565] imx-drm display-subsystem: bound imx-ipuv3-crtc.7 (ops 0x80940bcc)\n"
  "[    3.600990] dwhdmi-imx 120000.hdmi: Detected HDMI TX controller v1.30a with HDCP (DWC HDMI 3D TX PHY)\n"
  "[    3.610641] imx-drm display-subsystem: bound 120000.hdmi (ops 0x80940d44)\n"
- "[    3.617542] /soc/aips-bus@02000000/ldb/lvds-channel@0: could not find display-timings node\n"
- "[    3.625839] /soc/aips-bus@02000000/ldb/lvds-channel@0: no timings specified\n"
+ "[    3.617542] /soc/aips-bus at 02000000/ldb/lvds-channel at 0: could not find display-timings node\n"
+ "[    3.625839] /soc/aips-bus at 02000000/ldb/lvds-channel at 0: no timings specified\n"
  "[    3.632960] imx-ldb 2000000.aips-bus:ldb: dual-channel mode, ignoring second output\n"
  "[    3.640643] imx-drm display-subsystem: bound 2000000.aips-bus:ldb (ops 0x809408b0)\n"
  "[    3.725015] Console: switching to colour frame buffer device 128x48\n"
@@ -618,11 +597,6 @@
  "[    4.269588] usb 1-1.3: new full-speed USB device number 4 using ci_hdrc\n"
  "[    4.349641] systemd[1]: systemd 232 running in system mode. (+PAM -AUDIT -SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP -LIBCRYPTSETUP -G)\n"
  "[    4.368028] systemd[1]: Detected architecture arm.\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
+ ...
 
-e29c9f2f8670bc03cf09f985184b9bf4006a35b3963cc611114100d5b4ba127a
+3eb5dbd2792f8ec34f42765feb131b233b5ae03f56c15ec2e391aae00fcda792
