diff for duplicates of <20160317101828.GA13692@x1>

diff --git a/a/1.txt b/N1/1.txt
index 2f49d71..25e74c3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,13 +26,13 @@ refine after the merge-window closes.  Perhaps the internal patches
 you speak of are already part of this set?
 
 > > -----Original Message-----
-> > From: Peter Griffin [mailto:peter.griffin at linaro.org]
+> > From: Peter Griffin [mailto:peter.griffin@linaro.org]
 > > Sent: Wednesday, March 16, 2016 9:11 PM
 > > To: Lee Jones <lee.jones@linaro.org>
-> > Cc: ohad at wizery.com; devicetree at vger.kernel.org; f.fainelli at gmail.com;
-> > kernel at stlinux.com; Nathan_Lynch at mentor.com; linux-
-> > kernel at vger.kernel.org; s-anna at ti.com; linux-arm-
-> > kernel at lists.infradead.org
+> > Cc: ohad@wizery.com; devicetree@vger.kernel.org; f.fainelli@gmail.com;
+> > kernel@stlinux.com; Nathan_Lynch@mentor.com; linux-
+> > kernel@vger.kernel.org; s-anna@ti.com; linux-arm-
+> > kernel@lists.infradead.org
 > > Subject: Re: [STLinux Kernel] [PATCH v5 7/7] ARM: STiH407: Move over to
 > > using the 'reserved-memory' API for obtaining DMA memory
 > > 
@@ -76,25 +76,25 @@ you speak of are already part of this set?
 > > > > > +		#size-cells = <1>;
 > > > > > +		ranges;
 > > > > > +
-> > > > > +		gp0_reserved: rproc at 40000000 {
+> > > > > +		gp0_reserved: rproc@40000000 {
 > > > > > +			compatible = "shared-dma-pool";
 > > > > > +			reg = <0x40000000 0x01000000>;
 > > > > > +			no-map;
 > > > > > +		};
 > > > > > +
-> > > > > +		gp1_reserved: rproc at 41000000 {
+> > > > > +		gp1_reserved: rproc@41000000 {
 > > > > > +			compatible = "shared-dma-pool";
 > > > > > +			reg = <0x41000000 0x01000000>;
 > > > > > +			no-map;
 > > > > > +		};
 > > > > > +
-> > > > > +		audio_reserved: rproc at 42000000 {
+> > > > > +		audio_reserved: rproc@42000000 {
 > > > > > +			compatible = "shared-dma-pool";
 > > > > > +			reg = <0x42000000 0x01000000>;
 > > > > > +			no-map;
 > > > > > +		};
 > > > > > +
-> > > > > +		dmu_reserved: rproc at 43000000 {
+> > > > > +		dmu_reserved: rproc@43000000 {
 > > > > > +			compatible = "shared-dma-pool";
 > > > > > +			reg = <0x43000000 0x01000000>;
 > > > > > +			no-map;
@@ -162,11 +162,11 @@ you speak of are already part of this set?
 > > 
 > > _______________________________________________
 > > Kernel mailing list
-> > Kernel at stlinux.com
+> > Kernel@stlinux.com
 > > http://www.stlinux.com/mailman/listinfo/kernel
 
 -- 
 Lee Jones
 Linaro STMicroelectronics Landing Team Lead
-Linaro.org ? Open source software for ARM SoCs
+Linaro.org │ Open source software for ARM SoCs
 Follow Linaro: Facebook | Twitter | Blog
diff --git a/a/content_digest b/N1/content_digest
index 21ebeb2..0a774e8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,10 +4,19 @@
  "ref\020160316165526.GZ13692@x1\0"
  "ref\020160316201051.GA10042@griffinp-ThinkPad-X1-Carbon-2nd\0"
  "ref\0D0C04901035AEF47BB4C8387F4AA41F5359967@SAFEX1NODE23.st.com\0"
- "From\0lee.jones@linaro.org (Lee Jones)\0"
- "Subject\0[STLinux Kernel] [PATCH v5 7/7] ARM: STiH407: Move over to using the 'reserved-memory' API for obtaining DMA memory\0"
+ "From\0Lee Jones <lee.jones@linaro.org>\0"
+ "Subject\0Re: [STLinux Kernel] [PATCH v5 7/7] ARM: STiH407: Move over to using the 'reserved-memory' API for obtaining DMA memory\0"
  "Date\0Thu, 17 Mar 2016 10:18:28 +0000\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Loic PALLARDY <loic.pallardy@st.com>\0"
+ "Cc\0Peter Griffin <peter.griffin@linaro.org>"
+  ohad@wizery.com <ohad@wizery.com>
+  devicetree@vger.kernel.org <devicetree@vger.kernel.org>
+  f.fainelli@gmail.com <f.fainelli@gmail.com>
+  kernel@stlinux.com <kernel@stlinux.com>
+  Nathan_Lynch@mentor.com <Nathan_Lynch@mentor.com>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  s-anna@ti.com <s-anna@ti.com>
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "On Thu, 17 Mar 2016, Loic PALLARDY wrote:\n"
@@ -38,13 +47,13 @@
  "you speak of are already part of this set?\n"
  "\n"
  "> > -----Original Message-----\n"
- "> > From: Peter Griffin [mailto:peter.griffin at linaro.org]\n"
+ "> > From: Peter Griffin [mailto:peter.griffin@linaro.org]\n"
  "> > Sent: Wednesday, March 16, 2016 9:11 PM\n"
  "> > To: Lee Jones <lee.jones@linaro.org>\n"
- "> > Cc: ohad at wizery.com; devicetree at vger.kernel.org; f.fainelli at gmail.com;\n"
- "> > kernel at stlinux.com; Nathan_Lynch at mentor.com; linux-\n"
- "> > kernel at vger.kernel.org; s-anna at ti.com; linux-arm-\n"
- "> > kernel at lists.infradead.org\n"
+ "> > Cc: ohad@wizery.com; devicetree@vger.kernel.org; f.fainelli@gmail.com;\n"
+ "> > kernel@stlinux.com; Nathan_Lynch@mentor.com; linux-\n"
+ "> > kernel@vger.kernel.org; s-anna@ti.com; linux-arm-\n"
+ "> > kernel@lists.infradead.org\n"
  "> > Subject: Re: [STLinux Kernel] [PATCH v5 7/7] ARM: STiH407: Move over to\n"
  "> > using the 'reserved-memory' API for obtaining DMA memory\n"
  "> > \n"
@@ -88,25 +97,25 @@
  "> > > > > +\t\t#size-cells = <1>;\n"
  "> > > > > +\t\tranges;\n"
  "> > > > > +\n"
- "> > > > > +\t\tgp0_reserved: rproc at 40000000 {\n"
+ "> > > > > +\t\tgp0_reserved: rproc@40000000 {\n"
  "> > > > > +\t\t\tcompatible = \"shared-dma-pool\";\n"
  "> > > > > +\t\t\treg = <0x40000000 0x01000000>;\n"
  "> > > > > +\t\t\tno-map;\n"
  "> > > > > +\t\t};\n"
  "> > > > > +\n"
- "> > > > > +\t\tgp1_reserved: rproc at 41000000 {\n"
+ "> > > > > +\t\tgp1_reserved: rproc@41000000 {\n"
  "> > > > > +\t\t\tcompatible = \"shared-dma-pool\";\n"
  "> > > > > +\t\t\treg = <0x41000000 0x01000000>;\n"
  "> > > > > +\t\t\tno-map;\n"
  "> > > > > +\t\t};\n"
  "> > > > > +\n"
- "> > > > > +\t\taudio_reserved: rproc at 42000000 {\n"
+ "> > > > > +\t\taudio_reserved: rproc@42000000 {\n"
  "> > > > > +\t\t\tcompatible = \"shared-dma-pool\";\n"
  "> > > > > +\t\t\treg = <0x42000000 0x01000000>;\n"
  "> > > > > +\t\t\tno-map;\n"
  "> > > > > +\t\t};\n"
  "> > > > > +\n"
- "> > > > > +\t\tdmu_reserved: rproc at 43000000 {\n"
+ "> > > > > +\t\tdmu_reserved: rproc@43000000 {\n"
  "> > > > > +\t\t\tcompatible = \"shared-dma-pool\";\n"
  "> > > > > +\t\t\treg = <0x43000000 0x01000000>;\n"
  "> > > > > +\t\t\tno-map;\n"
@@ -174,13 +183,13 @@
  "> > \n"
  "> > _______________________________________________\n"
  "> > Kernel mailing list\n"
- "> > Kernel at stlinux.com\n"
+ "> > Kernel@stlinux.com\n"
  "> > http://www.stlinux.com/mailman/listinfo/kernel\n"
  "\n"
  "-- \n"
  "Lee Jones\n"
  "Linaro STMicroelectronics Landing Team Lead\n"
- "Linaro.org ? Open source software for ARM SoCs\n"
+ "Linaro.org \342\224\202 Open source software for ARM SoCs\n"
  Follow Linaro: Facebook | Twitter | Blog
 
-a5c0ba31c72e5b4fd23018a05649c5b3b36adaf44fb2d7ec61a548658360aa6b
+f9b888299f99aff2cf6c7fe347674142accd76f8252b85f637c7f79f1717386d
