diff for duplicates of <1463130397.3151.13.camel@toradex.com>

diff --git a/a/1.txt b/N1/1.txt
index 720b525..3f0cffa 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,7 +11,7 @@ On Thu, 2016-04-21 at 00:51 +0800, Dong Aisheng wrote:
 > mmcblk0boot0: mmc0:0001 Q2J55L partition 1 2.00 MiB
 > mmcblk0boot1: mmc0:0001 Q2J55L partition 2 2.00 MiB
 > mmcblk0rpmb: mmc0:0001 Q2J55L partition 3 4.00 MiB
->  mmcblk0: p1 p2
+> ?mmcblk0: p1 p2
 > 
 > After the fix:
 > mmc0: mmc_select_hs200 failed, error -74
@@ -20,12 +20,12 @@ On Thu, 2016-04-21 at 00:51 +0800, Dong Aisheng wrote:
 > mmcblk0boot0: mmc0:0001 Q2J55L partition 1 2.00 MiB
 > mmcblk0boot1: mmc0:0001 Q2J55L partition 2 2.00 MiB
 > mmcblk0rpmb: mmc0:0001 Q2J55L partition 3 4.00 MiB
->  mmcblk0: p1 p2
+> ?mmcblk0: p1 p2
 > 
 > Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
 > ---
->  drivers/mmc/core/mmc.c | 3 ++-
->  1 file changed, 2 insertions(+), 1 deletion(-)
+> ?drivers/mmc/core/mmc.c | 3 ++-
+> ?1 file changed, 2 insertions(+), 1 deletion(-)
 > 
 > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
 > index 55c8201..b573dc7 100644
@@ -33,66 +33,61 @@ On Thu, 2016-04-21 at 00:51 +0800, Dong Aisheng wrote:
 > +++ b/drivers/mmc/core/mmc.c
 > @@ -1315,7 +1315,8 @@ static int mmc_select_timing(struct mmc_card
 > *card)
->  
->  	if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200)
->  		err = mmc_select_hs200(card);
+> ?
+> ?	if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200)
+> ?		err = mmc_select_hs200(card);
 > -	else if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS)
 > +
 > +	if (err && (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS))
->  		err = mmc_select_hs(card);
->  
->  	if (err && err != -EBADMSG)
+> ?		err = mmc_select_hs(card);
+> ?
+> ?	if (err && err != -EBADMSG)
 
 
 This seems to break on TK1 where eMMC so far was detected as an 8-bit
 high speed MMC card. With this patch it reverts to detecting a 1-bit only
 MMC card! This has been observed both on a NVIDIA's Jetson TK1 as well as
-our new Toradex Apalis TK1 (CC Tegra mailing list, Jon Hunter and Lucas
+our new Toradex Apalis TK1?(CC Tegra mailing list,?Jon Hunter and?Lucas
 Stach as well). So far T30 is not affected as there we are still doing
 full HS200 with whatever issues that has.
 
 Before:
-[    3.726894] sdhci: Secure Digital Host Controller Interface driver
-[    3.733081] sdhci: Copyright(c) Pierre Ossman
-[    3.737462] sdhci-pltfm: SDHCI platform and OF driver helper
-[    3.753411] mmc0: Unknown controller version (3). You may experience
+[????3.726894] sdhci: Secure Digital Host Controller Interface driver
+[????3.733081] sdhci: Copyright(c) Pierre Ossman
+[????3.737462] sdhci-pltfm: SDHCI platform and OF driver helper
+[????3.753411] mmc0: Unknown controller version (3). You may experience
  problems.
-[    3.768345] mmc0: Invalid maximum block size, assuming 512 bytes
-[    3.814896] mmc0: SDHCI controller on 700b0600.sdhci [700b0600.sdhci]
+[????3.768345] mmc0: Invalid maximum block size, assuming 512 bytes
+[????3.814896] mmc0: SDHCI controller on 700b0600.sdhci [700b0600.sdhci]
  using ADMA 64-bit
-[    3.892088] mmc0: new high speed MMC card at address 0001
-[    3.899194] mmcblk0: mmc0:0001 SEM16G 14.7 GiB
-[    3.904217] mmcblk0boot0: mmc0:0001 SEM16G partition 1 4.00 MiB
-[    3.910645] mmcblk0boot1: mmc0:0001 SEM16G partition 2 4.00 MiB
-[    3.917119] mmcblk0rpmb: mmc0:0001 SEM16G partition 3 4.00 MiB
-[    3.926006]  mmcblk0: p1 p2 p3 p4 p5 p6 p7 p8 p9
-root@jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios 
-clock:          52000000 Hz
-actual clock:   51000000 Hz
-vdd:            21 (3.3 ~ 3.4 V)
-bus mode:       2 (push-pull)
-chip select:    0 (don't care)
-power mode:     2 (on)
-bus width:      3 (8 bits)
-timing spec:    1 (mmc high-speed)
+[????3.892088] mmc0: new high speed MMC card at address 0001
+[????3.899194] mmcblk0: mmc0:0001 SEM16G 14.7 GiB
+[????3.904217] mmcblk0boot0: mmc0:0001 SEM16G partition 1 4.00 MiB
+[????3.910645] mmcblk0boot1: mmc0:0001 SEM16G partition 2 4.00 MiB
+[????3.917119] mmcblk0rpmb: mmc0:0001 SEM16G partition 3 4.00 MiB
+[????3.926006]??mmcblk0: p1 p2 p3 p4 p5 p6 p7 p8 p9
+root at jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios?
+clock:??????????52000000 Hz
+actual clock:???51000000 Hz
+vdd:????????????21 (3.3 ~ 3.4 V)
+bus mode:???????2 (push-pull)
+chip select:????0 (don't care)
+power mode:?????2 (on)
+bus width:??????3 (8 bits)
+timing spec:????1 (mmc high-speed)
 signal voltage: 0 (3.30 V)
-driver type:    0 (driver type B)
+driver type:????0 (driver type B)
 
 After:
-[    3.899918] mmc0: new MMC card at address 0001
-root@jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios 
-clock:          25000000 Hz
-actual clock:   24727273 Hz
-vdd:            21 (3.3 ~ 3.4 V)
-bus mode:       2 (push-pull)
-chip select:    0 (don't care)
-power mode:     2 (on)
-bus width:      0 (1 bits)
-timing spec:    0 (legacy)
+[????3.899918] mmc0: new MMC card at address 0001
+root at jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios?
+clock:??????????25000000 Hz
+actual clock:???24727273 Hz
+vdd:????????????21 (3.3 ~ 3.4 V)
+bus mode:???????2 (push-pull)
+chip select:????0 (don't care)
+power mode:?????2 (on)
+bus width:??????0 (1 bits)
+timing spec:????0 (legacy)
 signal voltage: 0 (3.30 V)
-driver type:    0 (driver type B)
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+driver type:????0 (driver type B)
diff --git a/a/content_digest b/N1/content_digest
index e7eb917..1515c87 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,20 +1,9 @@
  "ref\01461171092-30631-1-git-send-email-aisheng.dong@nxp.com\0"
  "ref\01461171092-30631-3-git-send-email-aisheng.dong@nxp.com\0"
- "From\0Marcel Ziswiler <marcel.ziswiler@toradex.com>\0"
- "Subject\0Re: [PATCH 3/3] mmc: core: support hs speed mode if hs200 mode fails\0"
+ "From\0marcel.ziswiler@toradex.com (Marcel Ziswiler)\0"
+ "Subject\0[PATCH 3/3] mmc: core: support hs speed mode if hs200 mode fails\0"
  "Date\0Fri, 13 May 2016 09:06:38 +0000\0"
- "To\0linux-mmc@vger.kernel.org <linux-mmc@vger.kernel.org>"
- " aisheng.dong@nxp.com <aisheng.dong@nxp.com>\0"
- "Cc\0ulf.hansson@linaro.org <ulf.hansson@linaro.org>"
-  dev@lynxeye.de <dev@lynxeye.de>
-  dongas86@gmail.com <dongas86@gmail.com>
-  chris@printf.net <chris@printf.net>
-  haibo.chen@nxp.com <haibo.chen@nxp.com>
-  jonathanh@nvidia.com <jonathanh@nvidia.com>
-  linux-tegra@vger.kernel.org <linux-tegra@vger.kernel.org>
-  adrian.hunter@intel.com <adrian.hunter@intel.com>
-  shawnguo@kernel.org <shawnguo@kernel.org>
- " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, 2016-04-21 at 00:51 +0800, Dong Aisheng wrote:\n"
@@ -30,7 +19,7 @@
  "> mmcblk0boot0: mmc0:0001 Q2J55L partition 1 2.00 MiB\n"
  "> mmcblk0boot1: mmc0:0001 Q2J55L partition 2 2.00 MiB\n"
  "> mmcblk0rpmb: mmc0:0001 Q2J55L partition 3 4.00 MiB\n"
- "> \302\240mmcblk0: p1 p2\n"
+ "> ?mmcblk0: p1 p2\n"
  "> \n"
  "> After the fix:\n"
  "> mmc0: mmc_select_hs200 failed, error -74\n"
@@ -39,12 +28,12 @@
  "> mmcblk0boot0: mmc0:0001 Q2J55L partition 1 2.00 MiB\n"
  "> mmcblk0boot1: mmc0:0001 Q2J55L partition 2 2.00 MiB\n"
  "> mmcblk0rpmb: mmc0:0001 Q2J55L partition 3 4.00 MiB\n"
- "> \302\240mmcblk0: p1 p2\n"
+ "> ?mmcblk0: p1 p2\n"
  "> \n"
  "> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>\n"
  "> ---\n"
- "> \302\240drivers/mmc/core/mmc.c | 3 ++-\n"
- "> \302\2401 file changed, 2 insertions(+), 1 deletion(-)\n"
+ "> ?drivers/mmc/core/mmc.c | 3 ++-\n"
+ "> ?1 file changed, 2 insertions(+), 1 deletion(-)\n"
  "> \n"
  "> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c\n"
  "> index 55c8201..b573dc7 100644\n"
@@ -52,68 +41,63 @@
  "> +++ b/drivers/mmc/core/mmc.c\n"
  "> @@ -1315,7 +1315,8 @@ static int mmc_select_timing(struct mmc_card\n"
  "> *card)\n"
- "> \302\240\n"
- "> \302\240\tif (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200)\n"
- "> \302\240\t\terr = mmc_select_hs200(card);\n"
+ "> ?\n"
+ "> ?\tif (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200)\n"
+ "> ?\t\terr = mmc_select_hs200(card);\n"
  "> -\telse if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS)\n"
  "> +\n"
  "> +\tif (err && (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS))\n"
- "> \302\240\t\terr = mmc_select_hs(card);\n"
- "> \302\240\n"
- "> \302\240\tif (err && err != -EBADMSG)\n"
+ "> ?\t\terr = mmc_select_hs(card);\n"
+ "> ?\n"
+ "> ?\tif (err && err != -EBADMSG)\n"
  "\n"
  "\n"
  "This seems to break on TK1 where eMMC so far was detected as an 8-bit\n"
  "high speed MMC card. With this patch it reverts to detecting a 1-bit only\n"
  "MMC card! This has been observed both on a NVIDIA's Jetson TK1 as well as\n"
- "our new Toradex Apalis TK1\302\240(CC Tegra mailing list,\302\240Jon Hunter and\302\240Lucas\n"
+ "our new Toradex Apalis TK1?(CC Tegra mailing list,?Jon Hunter and?Lucas\n"
  "Stach as well). So far T30 is not affected as there we are still doing\n"
  "full HS200 with whatever issues that has.\n"
  "\n"
  "Before:\n"
- "[\302\240\302\240\302\240\302\2403.726894] sdhci: Secure Digital Host Controller Interface driver\n"
- "[\302\240\302\240\302\240\302\2403.733081] sdhci: Copyright(c) Pierre Ossman\n"
- "[\302\240\302\240\302\240\302\2403.737462] sdhci-pltfm: SDHCI platform and OF driver helper\n"
- "[\302\240\302\240\302\240\302\2403.753411] mmc0: Unknown controller version (3). You may experience\n"
+ "[????3.726894] sdhci: Secure Digital Host Controller Interface driver\n"
+ "[????3.733081] sdhci: Copyright(c) Pierre Ossman\n"
+ "[????3.737462] sdhci-pltfm: SDHCI platform and OF driver helper\n"
+ "[????3.753411] mmc0: Unknown controller version (3). You may experience\n"
  " problems.\n"
- "[\302\240\302\240\302\240\302\2403.768345] mmc0: Invalid maximum block size, assuming 512 bytes\n"
- "[\302\240\302\240\302\240\302\2403.814896] mmc0: SDHCI controller on 700b0600.sdhci [700b0600.sdhci]\n"
+ "[????3.768345] mmc0: Invalid maximum block size, assuming 512 bytes\n"
+ "[????3.814896] mmc0: SDHCI controller on 700b0600.sdhci [700b0600.sdhci]\n"
  " using ADMA 64-bit\n"
- "[\302\240\302\240\302\240\302\2403.892088] mmc0: new high speed MMC card at address 0001\n"
- "[\302\240\302\240\302\240\302\2403.899194] mmcblk0: mmc0:0001 SEM16G 14.7 GiB\n"
- "[\302\240\302\240\302\240\302\2403.904217] mmcblk0boot0: mmc0:0001 SEM16G partition 1 4.00 MiB\n"
- "[\302\240\302\240\302\240\302\2403.910645] mmcblk0boot1: mmc0:0001 SEM16G partition 2 4.00 MiB\n"
- "[\302\240\302\240\302\240\302\2403.917119] mmcblk0rpmb: mmc0:0001 SEM16G partition 3 4.00 MiB\n"
- "[\302\240\302\240\302\240\302\2403.926006]\302\240\302\240mmcblk0: p1 p2 p3 p4 p5 p6 p7 p8 p9\n"
- "root@jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios\302\240\n"
- "clock:\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\24052000000 Hz\n"
- "actual clock:\302\240\302\240\302\24051000000 Hz\n"
- "vdd:\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\24021 (3.3 ~ 3.4 V)\n"
- "bus mode:\302\240\302\240\302\240\302\240\302\240\302\240\302\2402 (push-pull)\n"
- "chip select:\302\240\302\240\302\240\302\2400 (don't care)\n"
- "power mode:\302\240\302\240\302\240\302\240\302\2402 (on)\n"
- "bus width:\302\240\302\240\302\240\302\240\302\240\302\2403 (8 bits)\n"
- "timing spec:\302\240\302\240\302\240\302\2401 (mmc high-speed)\n"
+ "[????3.892088] mmc0: new high speed MMC card at address 0001\n"
+ "[????3.899194] mmcblk0: mmc0:0001 SEM16G 14.7 GiB\n"
+ "[????3.904217] mmcblk0boot0: mmc0:0001 SEM16G partition 1 4.00 MiB\n"
+ "[????3.910645] mmcblk0boot1: mmc0:0001 SEM16G partition 2 4.00 MiB\n"
+ "[????3.917119] mmcblk0rpmb: mmc0:0001 SEM16G partition 3 4.00 MiB\n"
+ "[????3.926006]??mmcblk0: p1 p2 p3 p4 p5 p6 p7 p8 p9\n"
+ "root at jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios?\n"
+ "clock:??????????52000000 Hz\n"
+ "actual clock:???51000000 Hz\n"
+ "vdd:????????????21 (3.3 ~ 3.4 V)\n"
+ "bus mode:???????2 (push-pull)\n"
+ "chip select:????0 (don't care)\n"
+ "power mode:?????2 (on)\n"
+ "bus width:??????3 (8 bits)\n"
+ "timing spec:????1 (mmc high-speed)\n"
  "signal voltage: 0 (3.30 V)\n"
- "driver type:\302\240\302\240\302\240\302\2400 (driver type B)\n"
+ "driver type:????0 (driver type B)\n"
  "\n"
  "After:\n"
- "[\302\240\302\240\302\240\302\2403.899918] mmc0: new MMC card at address 0001\n"
- "root@jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios\302\240\n"
- "clock:\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\24025000000 Hz\n"
- "actual clock:\302\240\302\240\302\24024727273 Hz\n"
- "vdd:\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\24021 (3.3 ~ 3.4 V)\n"
- "bus mode:\302\240\302\240\302\240\302\240\302\240\302\240\302\2402 (push-pull)\n"
- "chip select:\302\240\302\240\302\240\302\2400 (don't care)\n"
- "power mode:\302\240\302\240\302\240\302\240\302\2402 (on)\n"
- "bus width:\302\240\302\240\302\240\302\240\302\240\302\2400 (1 bits)\n"
- "timing spec:\302\240\302\240\302\240\302\2400 (legacy)\n"
+ "[????3.899918] mmc0: new MMC card at address 0001\n"
+ "root at jetson_tk1:~# cat /sys/kernel/debug/mmc0/ios?\n"
+ "clock:??????????25000000 Hz\n"
+ "actual clock:???24727273 Hz\n"
+ "vdd:????????????21 (3.3 ~ 3.4 V)\n"
+ "bus mode:???????2 (push-pull)\n"
+ "chip select:????0 (don't care)\n"
+ "power mode:?????2 (on)\n"
+ "bus width:??????0 (1 bits)\n"
+ "timing spec:????0 (legacy)\n"
  "signal voltage: 0 (3.30 V)\n"
- "driver type:\302\240\302\240\302\240\302\2400 (driver type B)\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
+ driver type:????0 (driver type B)
 
-85b41454d4848c6b99cce050d40a4fd18181fdcf25471d611c0083681ceb70ed
+cfa064ecc5e500c9e05576eb41a086dec8c9171d0f5fae4e4cab0b77318a6966
