diff for duplicates of <87efpyfi2n.fsf@kamboji.qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index a290bc8..283ec4d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,14 +1,14 @@
 Brian Norris <briannorris@chromium.org> writes:
 
-> Build errors have been reported with CONFIG_PM=n:
+> Build errors have been reported with CONFIG_PM=3Dn:
 >
 > drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit
 > declaration of function 'ath10k_pci_suspend'
-> [-Werror=implicit-function-declaration]
+> [-Werror=3Dimplicit-function-declaration]
 >
 > drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit
 > declaration of function 'ath10k_pci_resume'
-> [-Werror=implicit-function-declaration]
+> [-Werror=3Dimplicit-function-declaration]
 >
 > These are caused by the combination of the following two commits:
 >
@@ -28,9 +28,9 @@ Brian Norris <briannorris@chromium.org> writes:
 > spread the #ifdef's further.
 >
 > Build tested with the following combinations:
-> CONFIG_PM=y && CONFIG_PM_SLEEP=y
-> CONFIG_PM=y && CONFIG_PM_SLEEP=n
-> CONFIG_PM=n
+> CONFIG_PM=3Dy && CONFIG_PM_SLEEP=3Dy
+> CONFIG_PM=3Dy && CONFIG_PM_SLEEP=3Dn
+> CONFIG_PM=3Dn
 >
 > Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is
 > supported but disabled")
@@ -46,7 +46,7 @@ Brian Norris <briannorris@chromium.org> writes:
 >> instead, to further extend Arnd's patch), or else revert Arnd's stuff
 >> and go with CONFIG_PM_SLEEP everywhere, which would resolve the original
 >> warning (promoted to error) that Arnd was resolving.
->> 
+>>=20
 >> I can send out one of these if you'd like.
 >
 > Here you go :)
@@ -55,9 +55,5 @@ Thanks! As this an unusual merge problem between two branches I applied
 this manually to ath.git master-pending branch for now. Let's see if
 kbuild bot is happy now.
 
--- 
-Kalle Valo
-_______________________________________________
-ath10k mailing list
-ath10k@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/ath10k
+--=20
+Kalle Valo=
diff --git a/a/content_digest b/N1/content_digest
index 4376bf0..a52bde6 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,24 +8,24 @@
  "Date\0Fri, 20 Oct 2017 06:29:21 +0000\0"
  "To\0Brian Norris <briannorris@chromium.org>\0"
  "Cc\0Ryan Hsu <ryanhsu@qti.qualcomm.com>"
-  Arnd Bergmann <arnd@arndb.de>
   Grant Grundler <grundler@chromium.org>
   linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>
   linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
- " ath10k@lists.infradead.org <ath10k@lists.infradead.org>\0"
+  ath10k@lists.infradead.org <ath10k@lists.infradead.org>
+ " Arnd Bergmann <arnd@arndb.de>\0"
  "\00:1\0"
  "b\0"
  "Brian Norris <briannorris@chromium.org> writes:\n"
  "\n"
- "> Build errors have been reported with CONFIG_PM=n:\n"
+ "> Build errors have been reported with CONFIG_PM=3Dn:\n"
  ">\n"
  "> drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit\n"
  "> declaration of function 'ath10k_pci_suspend'\n"
- "> [-Werror=implicit-function-declaration]\n"
+ "> [-Werror=3Dimplicit-function-declaration]\n"
  ">\n"
  "> drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit\n"
  "> declaration of function 'ath10k_pci_resume'\n"
- "> [-Werror=implicit-function-declaration]\n"
+ "> [-Werror=3Dimplicit-function-declaration]\n"
  ">\n"
  "> These are caused by the combination of the following two commits:\n"
  ">\n"
@@ -45,9 +45,9 @@
  "> spread the #ifdef's further.\n"
  ">\n"
  "> Build tested with the following combinations:\n"
- "> CONFIG_PM=y && CONFIG_PM_SLEEP=y\n"
- "> CONFIG_PM=y && CONFIG_PM_SLEEP=n\n"
- "> CONFIG_PM=n\n"
+ "> CONFIG_PM=3Dy && CONFIG_PM_SLEEP=3Dy\n"
+ "> CONFIG_PM=3Dy && CONFIG_PM_SLEEP=3Dn\n"
+ "> CONFIG_PM=3Dn\n"
  ">\n"
  "> Fixes: 96378bd2c6cd (\"ath10k: fix core PCI suspend when WoWLAN is\n"
  "> supported but disabled\")\n"
@@ -63,7 +63,7 @@
  ">> instead, to further extend Arnd's patch), or else revert Arnd's stuff\n"
  ">> and go with CONFIG_PM_SLEEP everywhere, which would resolve the original\n"
  ">> warning (promoted to error) that Arnd was resolving.\n"
- ">> \n"
+ ">>=20\n"
  ">> I can send out one of these if you'd like.\n"
  ">\n"
  "> Here you go :)\n"
@@ -72,11 +72,7 @@
  "this manually to ath.git master-pending branch for now. Let's see if\n"
  "kbuild bot is happy now.\n"
  "\n"
- "-- \n"
- "Kalle Valo\n"
- "_______________________________________________\n"
- "ath10k mailing list\n"
- "ath10k@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/ath10k
+ "--=20\n"
+ Kalle Valo=
 
-f06a2dba33878c87ffa0edf0998049bfcb7b46792585a68b9947cb18a825c553
+c752a5c49cb6229a1c85d9521037168da55b38afc2b2d6556811149f52e68b5c
