diff for duplicates of <20170308131806.GF29118@ulmo.ba.sec>

diff --git a/a/1.1.hdr b/a/1.1.hdr
deleted file mode 100644
index 5a32186..0000000
--- a/a/1.1.hdr
+++ /dev/null
@@ -1,3 +0,0 @@
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
diff --git a/a/1.2.bin b/a/1.2.bin
deleted file mode 100644
index a8637bb..0000000
--- a/a/1.2.bin
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAljABIwACgkQ3SOs138+
-s6Fzpg//bnBvs5JkQnsrQoKSz7gcAqDyW8rW0nuNAGRaNWFI5vfo/PHl2wUjRU6p
-eJoRk7OYYTNJCbDM0mBawykB06KJflzTnisUwmICVj+ByYg0h7gp3IVwCqIp8XnB
-qXcLy1TkXmZhIWgFwiB8BuYdhDF+nVal4UNDZlNm4XPcZ+DXvVRVhmKq7ElCz8qz
-Dw/26V8FoFpfAJElwRzNMb5G1Ei7TTOKCiwcjRvIf66vFmC8DoDVzUXK8OSB+4mB
-3luqemi19MRDY504lfnW6cNbJolYsHUwGBUqv3f28lytj/206Qtb5sfBjCeR8lua
-2uNoG/N7darxu+bANGwv20JOdNPurYmnOqs74yOJ46PXE2NKOBZcmgCLChgjzsoW
-3K1T/s0sjmmvmzGKnoy/c+7oRV1A6CfJfc+DiLIarVLFR1K2pO1k+tXdSW8mByHM
-vJBoa4zwDFK8V66PGbE9IEo2HmAuaHs3+qwRFtV+gaaYkqr28kGs+iA4l1YudIC8
-fxLC7c1S3t8QnG2oVvpnAP3PaYuTRNuV+2J3E+1r9iYk6rTJCcmzfBCwfcGuowVI
-nLQbagz4m9xGdhWxGEvmQBTiKXSVmLJ/5ek632OM7Oizs4Q8A6Fzm9qVB/DXmoHt
-ZHI4ub1HOSqVq9uDcB8toxXxl0UUGD8/mpyVWpiBCC363Pq1JWc=
-=4yxc
------END PGP SIGNATURE-----
diff --git a/a/1.2.hdr b/a/1.2.hdr
deleted file mode 100644
index 5e5352c..0000000
--- a/a/1.2.hdr
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: application/pgp-signature; name="signature.asc"
diff --git a/a/1.1.txt b/N1/1.txt
similarity index 85%
rename from a/1.1.txt
rename to N1/1.txt
index 75a2b54..e8607b8 100644
--- a/a/1.1.txt
+++ b/N1/1.txt
@@ -21,17 +21,17 @@ On Wed, Mar 08, 2017 at 11:46:10AM +0000, Jon Hunter wrote:
 > >  	compatible = "nvidia,p3310", "nvidia,tegra186";
 > >  
 > >  	aliases {
-> > +		sdhci0 = "/sdhci@3460000";
-> > +		sdhci1 = "/sdhci@3400000";
+> > +		sdhci0 = "/sdhci at 3460000";
+> > +		sdhci1 = "/sdhci at 3400000";
 > 
 > Any reason why you don't include all 3 sdhci controllers here?
 
 It turns out this is completely useless. The intention had been to make
-sdhci@3460000 appear as mmc0 and sdhci@3400000 as mmc1 in order to give
+sdhci at 3460000 appear as mmc0 and sdhci at 3400000 as mmc1 in order to give
 a more natural ordering (built-in eMMC first, then external SD/MMC) but
 there's no code in the kernel that will enforce this.
 
-This is also the reason why sdhci@3440000 is not included in this list
+This is also the reason why sdhci at 3440000 is not included in this list
 because it connects to a WIFI/Bluetooth module.
 
 I'm slightly leaning towards leaving this in and possibly write a patch
@@ -43,13 +43,13 @@ order would still provide the least surprise.
 > 
 > >  		serial0 = &uarta;
 > >  		i2c0 = "/bpmp/i2c";
-> >  		i2c1 = "/i2c@3160000";
+> >  		i2c1 = "/i2c at 3160000";
 > > @@ -72,6 +74,32 @@
 > >  		status = "okay";
 > >  	};
 > >  
 > > +	/* SDMMC1 (SD/MMC) */
-> > +	sdhci@3400000 {
+> > +	sdhci at 3400000 {
 > > +		status = "okay";
 > > +
 > > +		cd-gpios = <&gpio TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_LOW>;
@@ -79,12 +79,12 @@ Yes, I think it's best to move vmmc-supply to the P2771 board file...
 > > +	};
 > > +
 > > +	/* SDMMC3 (SDIO) */
-> > +	sdhci@3440000 {
+> > +	sdhci at 3440000 {
 > > +		status = "okay";
 > > +	};
 > > +
 > > +	/* SDMMC4 (eMMC) */
-> > +	sdhci@3460000 {
+> > +	sdhci at 3460000 {
 > > +		status = "okay";
 > > +		bus-width = <8>;
 > > +		non-removable;
@@ -93,7 +93,7 @@ Yes, I think it's best to move vmmc-supply to the P2771 board file...
 > > +		vmmc-supply = <&vdd_3v3_sys>;
 > > +	};
 > > +
-> >  	hsp@3c00000 {
+> >  	hsp at 3c00000 {
 > >  		status = "okay";
 > >  	};
 > > @@ -333,5 +361,19 @@
@@ -101,7 +101,7 @@ Yes, I think it's best to move vmmc-supply to the P2771 board file...
 > >  			vin-supply = <&vdd_1v8>;
 > >  		};
 > > +
-> > +		vdd_sd: regulator@2 {
+> > +		vdd_sd: regulator at 2 {
 > > +			compatible = "regulator-fixed";
 > > +			reg = <2>;
 > > +
@@ -129,3 +129,10 @@ would still all work given the mixup...
 
 Thanks,
 Thierry
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: signature.asc
+Type: application/pgp-signature
+Size: 833 bytes
+Desc: not available
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170308/66e5b002/attachment.sig>
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 4b86001..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,4 +0,0 @@
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index 8133cf0..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-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 8ca3915..cdfc99b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,11 @@
  "ref\020170223173053.19701-1-thierry.reding@gmail.com\0"
  "ref\020170223173053.19701-7-thierry.reding@gmail.com\0"
  "ref\038bcdf00-d85a-07fc-d557-bdca581eb333@nvidia.com\0"
- "From\0Thierry Reding <thierry.reding@gmail.com>\0"
- "Subject\0Re: [PATCH 07/11] arm64: tegra: Enable SDHCI controllers on P3110\0"
+ "From\0thierry.reding@gmail.com (Thierry Reding)\0"
+ "Subject\0[PATCH 07/11] arm64: tegra: Enable SDHCI controllers on P3110\0"
  "Date\0Wed, 8 Mar 2017 14:18:06 +0100\0"
- "To\0Jon Hunter <jonathanh@nvidia.com>\0"
- "Cc\0linux-tegra@vger.kernel.org"
-  Alexandre Courbot <gnurou@gmail.com>
- " linux-arm-kernel@lists.infradead.org\0"
- "\02:1.1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "On Wed, Mar 08, 2017 at 11:46:10AM +0000, Jon Hunter wrote:\n"
  "> \n"
@@ -33,17 +30,17 @@
  "> >  \tcompatible = \"nvidia,p3310\", \"nvidia,tegra186\";\n"
  "> >  \n"
  "> >  \taliases {\n"
- "> > +\t\tsdhci0 = \"/sdhci@3460000\";\n"
- "> > +\t\tsdhci1 = \"/sdhci@3400000\";\n"
+ "> > +\t\tsdhci0 = \"/sdhci at 3460000\";\n"
+ "> > +\t\tsdhci1 = \"/sdhci at 3400000\";\n"
  "> \n"
  "> Any reason why you don't include all 3 sdhci controllers here?\n"
  "\n"
  "It turns out this is completely useless. The intention had been to make\n"
- "sdhci@3460000 appear as mmc0 and sdhci@3400000 as mmc1 in order to give\n"
+ "sdhci at 3460000 appear as mmc0 and sdhci at 3400000 as mmc1 in order to give\n"
  "a more natural ordering (built-in eMMC first, then external SD/MMC) but\n"
  "there's no code in the kernel that will enforce this.\n"
  "\n"
- "This is also the reason why sdhci@3440000 is not included in this list\n"
+ "This is also the reason why sdhci at 3440000 is not included in this list\n"
  "because it connects to a WIFI/Bluetooth module.\n"
  "\n"
  "I'm slightly leaning towards leaving this in and possibly write a patch\n"
@@ -55,13 +52,13 @@
  "> \n"
  "> >  \t\tserial0 = &uarta;\n"
  "> >  \t\ti2c0 = \"/bpmp/i2c\";\n"
- "> >  \t\ti2c1 = \"/i2c@3160000\";\n"
+ "> >  \t\ti2c1 = \"/i2c at 3160000\";\n"
  "> > @@ -72,6 +74,32 @@\n"
  "> >  \t\tstatus = \"okay\";\n"
  "> >  \t};\n"
  "> >  \n"
  "> > +\t/* SDMMC1 (SD/MMC) */\n"
- "> > +\tsdhci@3400000 {\n"
+ "> > +\tsdhci at 3400000 {\n"
  "> > +\t\tstatus = \"okay\";\n"
  "> > +\n"
  "> > +\t\tcd-gpios = <&gpio TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_LOW>;\n"
@@ -91,12 +88,12 @@
  "> > +\t};\n"
  "> > +\n"
  "> > +\t/* SDMMC3 (SDIO) */\n"
- "> > +\tsdhci@3440000 {\n"
+ "> > +\tsdhci at 3440000 {\n"
  "> > +\t\tstatus = \"okay\";\n"
  "> > +\t};\n"
  "> > +\n"
  "> > +\t/* SDMMC4 (eMMC) */\n"
- "> > +\tsdhci@3460000 {\n"
+ "> > +\tsdhci at 3460000 {\n"
  "> > +\t\tstatus = \"okay\";\n"
  "> > +\t\tbus-width = <8>;\n"
  "> > +\t\tnon-removable;\n"
@@ -105,7 +102,7 @@
  "> > +\t\tvmmc-supply = <&vdd_3v3_sys>;\n"
  "> > +\t};\n"
  "> > +\n"
- "> >  \thsp@3c00000 {\n"
+ "> >  \thsp at 3c00000 {\n"
  "> >  \t\tstatus = \"okay\";\n"
  "> >  \t};\n"
  "> > @@ -333,5 +361,19 @@\n"
@@ -113,7 +110,7 @@
  "> >  \t\t\tvin-supply = <&vdd_1v8>;\n"
  "> >  \t\t};\n"
  "> > +\n"
- "> > +\t\tvdd_sd: regulator@2 {\n"
+ "> > +\t\tvdd_sd: regulator at 2 {\n"
  "> > +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> > +\t\t\treg = <2>;\n"
  "> > +\n"
@@ -140,31 +137,13 @@
  "... and move this to the P2771 board file as well.\n"
  "\n"
  "Thanks,\n"
- Thierry
- "\02:1.2\0"
- "fn\0signature.asc\0"
- "b\0"
- "-----BEGIN PGP SIGNATURE-----\n"
- "\n"
- "iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAljABIwACgkQ3SOs138+\n"
- "s6Fzpg//bnBvs5JkQnsrQoKSz7gcAqDyW8rW0nuNAGRaNWFI5vfo/PHl2wUjRU6p\n"
- "eJoRk7OYYTNJCbDM0mBawykB06KJflzTnisUwmICVj+ByYg0h7gp3IVwCqIp8XnB\n"
- "qXcLy1TkXmZhIWgFwiB8BuYdhDF+nVal4UNDZlNm4XPcZ+DXvVRVhmKq7ElCz8qz\n"
- "Dw/26V8FoFpfAJElwRzNMb5G1Ei7TTOKCiwcjRvIf66vFmC8DoDVzUXK8OSB+4mB\n"
- "3luqemi19MRDY504lfnW6cNbJolYsHUwGBUqv3f28lytj/206Qtb5sfBjCeR8lua\n"
- "2uNoG/N7darxu+bANGwv20JOdNPurYmnOqs74yOJ46PXE2NKOBZcmgCLChgjzsoW\n"
- "3K1T/s0sjmmvmzGKnoy/c+7oRV1A6CfJfc+DiLIarVLFR1K2pO1k+tXdSW8mByHM\n"
- "vJBoa4zwDFK8V66PGbE9IEo2HmAuaHs3+qwRFtV+gaaYkqr28kGs+iA4l1YudIC8\n"
- "fxLC7c1S3t8QnG2oVvpnAP3PaYuTRNuV+2J3E+1r9iYk6rTJCcmzfBCwfcGuowVI\n"
- "nLQbagz4m9xGdhWxGEvmQBTiKXSVmLJ/5ek632OM7Oizs4Q8A6Fzm9qVB/DXmoHt\n"
- "ZHI4ub1HOSqVq9uDcB8toxXxl0UUGD8/mpyVWpiBCC363Pq1JWc=\n"
- "=4yxc\n"
- "-----END PGP SIGNATURE-----\n"
- "\01:2\0"
- "b\0"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ "Thierry\n"
+ "-------------- next part --------------\n"
+ "A non-text attachment was scrubbed...\n"
+ "Name: signature.asc\n"
+ "Type: application/pgp-signature\n"
+ "Size: 833 bytes\n"
+ "Desc: not available\n"
+ URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170308/66e5b002/attachment.sig>
 
-8754778792b27d437bd98d55c2f2c6757fb59cd6eca184614c5104be9ec672c5
+cb0383357b0c3675fd34ec097676c165484c1bf3c5a4a319f72dea30de1dcf3e
