diff for duplicates of <20200610113752.65d6f537@why>

diff --git a/a/1.txt b/N1/1.txt
index 9268fae..9842701 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,25 +32,25 @@ Jaehoon Chung <jh80.chung@samsung.com> wrote:
 > >> Changes for v2:
 > >> - collect Jaehoon R-b
 > >>
-> >>   drivers/mmc/sdhci.c | 23 +++++++++++++++--------
-> >>   1 file changed, 15 insertions(+), 8 deletions(-)
+> >> ? drivers/mmc/sdhci.c | 23 +++++++++++++++--------
+> >> ? 1 file changed, 15 insertions(+), 8 deletions(-)
 > >>
 > >> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
 > >> index 92cc8434af..280b8c88eb 100644
 > >> --- a/drivers/mmc/sdhci.c
 > >> +++ b/drivers/mmc/sdhci.c
 > >> @@ -594,14 +594,21 @@ static int sdhci_set_ios(struct mmc *mmc)
-> >>               ctrl &= ~SDHCI_CTRL_4BITBUS;
-> >>       }
-> >>   -    if (mmc->clock > 26000000)
-> >> -        ctrl |= SDHCI_CTRL_HISPD;
-> >> -    else
-> >> -        ctrl &= ~SDHCI_CTRL_HISPD;
+> >> ????????????? ctrl &= ~SDHCI_CTRL_4BITBUS;
+> >> ????? }
+> >> ? -??? if (mmc->clock > 26000000)
+> >> -??????? ctrl |= SDHCI_CTRL_HISPD;
+> >> -??? else
+> >> -??????? ctrl &= ~SDHCI_CTRL_HISPD;
 > >> -
-> >> -    if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||
-> >> -        (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE))
-> >> -        ctrl &= ~SDHCI_CTRL_HISPD;
-> >> +    if (!(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||  
+> >> -??? if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||
+> >> -??????? (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE))
+> >> -??????? ctrl &= ~SDHCI_CTRL_HISPD;
+> >> +??? if (!(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||  
 > > 
 > > Should that be "&&" rather than "||"? Otherwise this will always
 > > evaluate to true unless *both* quirks are set, which isn't
@@ -69,8 +69,3 @@ Tested-by: Marc Zyngier <maz@kernel.org>
 	M.
 -- 
 Jazz is not dead. It just smells funny...
-
-_______________________________________________
-Linux-rockchip mailing list
-Linux-rockchip@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-rockchip
diff --git a/a/content_digest b/N1/content_digest
index 0038f8c..426482a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,19 +2,10 @@
  "ref\0CGME20200609143823epcas1p24772f20296869f9a7dc5ed53460ea0a4@epcas1p2.samsung.com\0"
  "ref\0097786ed-37ca-cf20-35f4-20a57e6c3b63@arm.com\0"
  "ref\0b46fe992-89d4-4a5f-fdb3-e2ec53de2b11@samsung.com\0"
- "ref\0b46fe992-89d4-4a5f-fdb3-e2ec53de2b11-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org\0"
- "From\0Marc Zyngier <maz-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
- "Subject\0Re: [PATCH v2] mmc: sdhci: Fix HISPD bit handling\0"
+ "From\0Marc Zyngier <maz@kernel.org>\0"
+ "Subject\0[PATCH v2] mmc: sdhci: Fix HISPD bit handling\0"
  "Date\0Wed, 10 Jun 2020 11:37:52 +0100\0"
- "To\0Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\0"
- "Cc\0Peng Fan <peng.fan-3arQi8VN3Tc@public.gmane.org>"
-  u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org
-  linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org
-  Kever Yang <kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
-  linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
-  sunil-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org
- " Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\0"
+ "To\0u-boot@lists.denx.de\0"
  "\00:1\0"
  "b\0"
  "On Wed, 10 Jun 2020 12:45:33 +0900\n"
@@ -51,25 +42,25 @@
  "> >> Changes for v2:\n"
  "> >> - collect Jaehoon R-b\n"
  "> >>\n"
- "> >> \302\240 drivers/mmc/sdhci.c | 23 +++++++++++++++--------\n"
- "> >> \302\240 1 file changed, 15 insertions(+), 8 deletions(-)\n"
+ "> >> ? drivers/mmc/sdhci.c | 23 +++++++++++++++--------\n"
+ "> >> ? 1 file changed, 15 insertions(+), 8 deletions(-)\n"
  "> >>\n"
  "> >> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c\n"
  "> >> index 92cc8434af..280b8c88eb 100644\n"
  "> >> --- a/drivers/mmc/sdhci.c\n"
  "> >> +++ b/drivers/mmc/sdhci.c\n"
  "> >> @@ -594,14 +594,21 @@ static int sdhci_set_ios(struct mmc *mmc)\n"
- "> >> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ctrl &= ~SDHCI_CTRL_4BITBUS;\n"
- "> >> \302\240\302\240\302\240\302\240\302\240 }\n"
- "> >> \302\240 -\302\240\302\240\302\240 if (mmc->clock > 26000000)\n"
- "> >> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ctrl |= SDHCI_CTRL_HISPD;\n"
- "> >> -\302\240\302\240\302\240 else\n"
- "> >> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ctrl &= ~SDHCI_CTRL_HISPD;\n"
+ "> >> ????????????? ctrl &= ~SDHCI_CTRL_4BITBUS;\n"
+ "> >> ????? }\n"
+ "> >> ? -??? if (mmc->clock > 26000000)\n"
+ "> >> -??????? ctrl |= SDHCI_CTRL_HISPD;\n"
+ "> >> -??? else\n"
+ "> >> -??????? ctrl &= ~SDHCI_CTRL_HISPD;\n"
  "> >> -\n"
- "> >> -\302\240\302\240\302\240 if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||\n"
- "> >> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE))\n"
- "> >> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ctrl &= ~SDHCI_CTRL_HISPD;\n"
- "> >> +\302\240\302\240\302\240 if (!(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||  \n"
+ "> >> -??? if ((host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||\n"
+ "> >> -??????? (host->quirks & SDHCI_QUIRK_BROKEN_HISPD_MODE))\n"
+ "> >> -??????? ctrl &= ~SDHCI_CTRL_HISPD;\n"
+ "> >> +??? if (!(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) ||  \n"
  "> > \n"
  "> > Should that be \"&&\" rather than \"||\"? Otherwise this will always\n"
  "> > evaluate to true unless *both* quirks are set, which isn't\n"
@@ -87,11 +78,6 @@
  "\n"
  "\tM.\n"
  "-- \n"
- "Jazz is not dead. It just smells funny...\n"
- "\n"
- "_______________________________________________\n"
- "Linux-rockchip mailing list\n"
- "Linux-rockchip@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-rockchip
+ Jazz is not dead. It just smells funny...
 
-a2e589c357b1df2a64156ddebc1fb2385370881b4b5e3a2ad8336e8cc61aa4da
+fc478508d84c51843c01155f610377cacbe1edd262f536dd109cb4948698a6fa
