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

diff --git a/a/1.txt b/N1/1.txt
index 8c3c39a..68a1fa4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,30 +4,37 @@ Brian Norris <briannorris@chromium.org> writes:
 >
 > On Thu, Oct 19, 2017 at 02:32:45PM +0000, Kalle Valo wrote:
 >> Kalle Valo <kvalo@qca.qualcomm.com> writes:
->> 
+>>=20
 >> > Brian Norris <briannorris@chromium.org> wrote:
 >> >
 >> >> For devices where the FW supports WoWLAN but user-space has not
->> >> configured it, we don't do any PCI-specific suspend/resume operations,
+>> >> configured it, we don't do any PCI-specific suspend/resume operations=
+,
 >> >> because mac80211 doesn't call drv_suspend() when !wowlan. This has
->> >> particularly bad effects for some platforms, because we don't stop the
+>> >> particularly bad effects for some platforms, because we don't stop th=
+e
 >> >> power-save timer, and if this timer goes off after the PCI controller
 >> >> has suspended the link, Bad Things will happen.
->> >> 
->> >> Commit 32faa3f0ee50 ("ath10k: add the PCI PM core suspend/resume ops")
+>> >>=20
+>> >> Commit 32faa3f0ee50 ("ath10k: add the PCI PM core suspend/resume ops"=
+)
 >> >> got some of this right, in that it understood there was a problem on
 >> >> non-WoWLAN firmware. But it forgot the $subject case.
->> >> 
->> >> Fix this by moving all the PCI driver suspend/resume logic exclusively
+>> >>=20
+>> >> Fix this by moving all the PCI driver suspend/resume logic exclusivel=
+y
 >> >> into the driver PM hooks. This shouldn't affect WoWLAN support much
 >> >> (this just gets executed later on).
->> >> 
->> >> I would just as well kill the entirety of ath10k_hif_suspend(), as it's
->> >> not even implemented on the USB or SDIO drivers. I expect that we don't
+>> >>=20
+>> >> I would just as well kill the entirety of ath10k_hif_suspend(), as it=
+'s
+>> >> not even implemented on the USB or SDIO drivers. I expect that we don=
+'t
 >> >> need the callback, except to return "supported" (i.e., 0) or "not
 >> >> supported" (i.e., -EOPNOTSUPP).
->> >> 
->> >> Fixes: 32faa3f0ee50 ("ath10k: add the PCI PM core suspend/resume ops")
+>> >>=20
+>> >> Fixes: 32faa3f0ee50 ("ath10k: add the PCI PM core suspend/resume ops"=
+)
 >> >> Fixes: 77258d409ce4 ("ath10k: enable pci soc powersaving")
 >> >> Signed-off-by: Brian Norris <briannorris@chromium.org>
 >> >> Cc: Ryan Hsu <ryanhsu@qti.qualcomm.com>
@@ -37,8 +44,9 @@ Brian Norris <briannorris@chromium.org> writes:
 >> >
 >> > Patch applied to ath-next branch of ath.git, thanks.
 >> >
->> > 96378bd2c6cd ath10k: fix core PCI suspend when WoWLAN is supported but disabled
->> 
+>> > 96378bd2c6cd ath10k: fix core PCI suspend when WoWLAN is supported but=
+ disabled
+>>=20
 >> Kbuild found a build problem, I suspect it's caused by this patch:
 >
 > Actually, it's the interaction of this patch and Arnd's patch:
@@ -71,14 +79,14 @@ to 4.15, that's why they were applied to a different branch.
 
 >> 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]
+>>=20
 >> 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]
+>>=20
 >> http://lists.infradead.org/pipermail/ath10k/2017-October/010269.html
->> 
+>>=20
 >> The .config.gz there doesn't have CONFIG_PM set, maybe that's the
 >> problem?
 >
@@ -94,9 +102,5 @@ to 4.15, that's why they were applied to a different branch.
 
 I see that you already sent the patch, thanks!
 
--- 
-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 e639c90..20c5bc4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,11 +7,11 @@
  "Date\0Fri, 20 Oct 2017 06:24:31 +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"
@@ -20,30 +20,37 @@
  ">\n"
  "> On Thu, Oct 19, 2017 at 02:32:45PM +0000, Kalle Valo wrote:\n"
  ">> Kalle Valo <kvalo@qca.qualcomm.com> writes:\n"
- ">> \n"
+ ">>=20\n"
  ">> > Brian Norris <briannorris@chromium.org> wrote:\n"
  ">> >\n"
  ">> >> For devices where the FW supports WoWLAN but user-space has not\n"
- ">> >> configured it, we don't do any PCI-specific suspend/resume operations,\n"
+ ">> >> configured it, we don't do any PCI-specific suspend/resume operations=\n"
+ ",\n"
  ">> >> because mac80211 doesn't call drv_suspend() when !wowlan. This has\n"
- ">> >> particularly bad effects for some platforms, because we don't stop the\n"
+ ">> >> particularly bad effects for some platforms, because we don't stop th=\n"
+ "e\n"
  ">> >> power-save timer, and if this timer goes off after the PCI controller\n"
  ">> >> has suspended the link, Bad Things will happen.\n"
- ">> >> \n"
- ">> >> Commit 32faa3f0ee50 (\"ath10k: add the PCI PM core suspend/resume ops\")\n"
+ ">> >>=20\n"
+ ">> >> Commit 32faa3f0ee50 (\"ath10k: add the PCI PM core suspend/resume ops\"=\n"
+ ")\n"
  ">> >> got some of this right, in that it understood there was a problem on\n"
  ">> >> non-WoWLAN firmware. But it forgot the $subject case.\n"
- ">> >> \n"
- ">> >> Fix this by moving all the PCI driver suspend/resume logic exclusively\n"
+ ">> >>=20\n"
+ ">> >> Fix this by moving all the PCI driver suspend/resume logic exclusivel=\n"
+ "y\n"
  ">> >> into the driver PM hooks. This shouldn't affect WoWLAN support much\n"
  ">> >> (this just gets executed later on).\n"
- ">> >> \n"
- ">> >> I would just as well kill the entirety of ath10k_hif_suspend(), as it's\n"
- ">> >> not even implemented on the USB or SDIO drivers. I expect that we don't\n"
+ ">> >>=20\n"
+ ">> >> I would just as well kill the entirety of ath10k_hif_suspend(), as it=\n"
+ "'s\n"
+ ">> >> not even implemented on the USB or SDIO drivers. I expect that we don=\n"
+ "'t\n"
  ">> >> need the callback, except to return \"supported\" (i.e., 0) or \"not\n"
  ">> >> supported\" (i.e., -EOPNOTSUPP).\n"
- ">> >> \n"
- ">> >> Fixes: 32faa3f0ee50 (\"ath10k: add the PCI PM core suspend/resume ops\")\n"
+ ">> >>=20\n"
+ ">> >> Fixes: 32faa3f0ee50 (\"ath10k: add the PCI PM core suspend/resume ops\"=\n"
+ ")\n"
  ">> >> Fixes: 77258d409ce4 (\"ath10k: enable pci soc powersaving\")\n"
  ">> >> Signed-off-by: Brian Norris <briannorris@chromium.org>\n"
  ">> >> Cc: Ryan Hsu <ryanhsu@qti.qualcomm.com>\n"
@@ -53,8 +60,9 @@
  ">> >\n"
  ">> > Patch applied to ath-next branch of ath.git, thanks.\n"
  ">> >\n"
- ">> > 96378bd2c6cd ath10k: fix core PCI suspend when WoWLAN is supported but disabled\n"
- ">> \n"
+ ">> > 96378bd2c6cd ath10k: fix core PCI suspend when WoWLAN is supported but=\n"
+ " disabled\n"
+ ">>=20\n"
  ">> Kbuild found a build problem, I suspect it's caused by this patch:\n"
  ">\n"
  "> Actually, it's the interaction of this patch and Arnd's patch:\n"
@@ -87,14 +95,14 @@
  "\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"
- ">> \n"
+ ">> [-Werror=3Dimplicit-function-declaration]\n"
+ ">>=20\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"
- ">> \n"
+ ">> [-Werror=3Dimplicit-function-declaration]\n"
+ ">>=20\n"
  ">> http://lists.infradead.org/pipermail/ath10k/2017-October/010269.html\n"
- ">> \n"
+ ">>=20\n"
  ">> The .config.gz there doesn't have CONFIG_PM set, maybe that's the\n"
  ">> problem?\n"
  ">\n"
@@ -110,11 +118,7 @@
  "\n"
  "I see that you already sent the patch, thanks!\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=
 
-97e02f57e631bffa87d18bb73fbd2890220a09c9298aca28a9161eb26a7071a9
+81bcb583dd35af09e1d340281762a5c99d334025d48ea4e876951caf5b0b6f2d
