diff for duplicates of <871svr8d83.fsf@kamboji.qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index d5e2672..4910665 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -40,11 +40,11 @@ Kalle Valo <kvalo@qca.qualcomm.com> writes:
 >> +++ b/drivers/net/wireless/ath/ath10k/core.c
 >> @@ -2164,6 +2164,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
 >>  	ath10k_core_free_firmware_files(ar);
->>  
+>> =20
 >>  err_power_down:
 >> +	ath10k_hif_stop(ar);
 >>  	ath10k_hif_power_down(ar);
->>  
+>> =20
 >>  	return ret;
 >
 > This breaks the symmetry, we should not be calling ath10k_hif_stop() if
@@ -69,25 +69,21 @@ that work?
 --- a/drivers/net/wireless/ath/ath10k/pci.c
 +++ b/drivers/net/wireless/ath/ath10k/pci.c
 @@ -1648,6 +1648,8 @@ static int ath10k_pci_hif_start(struct ath10k *ar)
- 
+=20
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot hif start\n");
- 
+=20
 +	napi_enable(&ar->napi);
 +
  	ath10k_pci_irq_enable(ar);
  	ath10k_pci_rx_post(ar);
- 
+=20
 @@ -2532,7 +2534,6 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
  		ath10k_err(ar, "could not wake up target CPU: %d\n", ret);
  		goto err_ce;
  	}
 -	napi_enable(&ar->napi);
- 
+=20
  	return 0;
 
--- 
-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 81fdbdd..0094e52 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,9 +5,9 @@
  "Date\0Wed, 25 Jan 2017 13:46:28 +0000\0"
  "To\0Shajakhan"
  " Mohammed Shafi (Mohammed Shafi) <mohammed@qti.qualcomm.com>\0"
- "Cc\0mohammed@codeaurora.org <mohammed@codeaurora.org>"
-  linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>
- " ath10k@lists.infradead.org <ath10k@lists.infradead.org>\0"
+ "Cc\0ath10k@lists.infradead.org <ath10k@lists.infradead.org>"
+  mohammed@codeaurora.org <mohammed@codeaurora.org>
+ " linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "Kalle Valo <kvalo@qca.qualcomm.com> writes:\n"
@@ -52,11 +52,11 @@
  ">> +++ b/drivers/net/wireless/ath/ath10k/core.c\n"
  ">> @@ -2164,6 +2164,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)\n"
  ">>  \tath10k_core_free_firmware_files(ar);\n"
- ">>  \n"
+ ">> =20\n"
  ">>  err_power_down:\n"
  ">> +\tath10k_hif_stop(ar);\n"
  ">>  \tath10k_hif_power_down(ar);\n"
- ">>  \n"
+ ">> =20\n"
  ">>  \treturn ret;\n"
  ">\n"
  "> This breaks the symmetry, we should not be calling ath10k_hif_stop() if\n"
@@ -81,27 +81,23 @@
  "--- a/drivers/net/wireless/ath/ath10k/pci.c\n"
  "+++ b/drivers/net/wireless/ath/ath10k/pci.c\n"
  "@@ -1648,6 +1648,8 @@ static int ath10k_pci_hif_start(struct ath10k *ar)\n"
- " \n"
+ "=20\n"
  " \tath10k_dbg(ar, ATH10K_DBG_BOOT, \"boot hif start\\n\");\n"
- " \n"
+ "=20\n"
  "+\tnapi_enable(&ar->napi);\n"
  "+\n"
  " \tath10k_pci_irq_enable(ar);\n"
  " \tath10k_pci_rx_post(ar);\n"
- " \n"
+ "=20\n"
  "@@ -2532,7 +2534,6 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)\n"
  " \t\tath10k_err(ar, \"could not wake up target CPU: %d\\n\", ret);\n"
  " \t\tgoto err_ce;\n"
  " \t}\n"
  "-\tnapi_enable(&ar->napi);\n"
- " \n"
+ "=20\n"
  " \treturn 0;\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=
 
-10d5eb557f971bae1acd1a1e1563cf0fb8746925467f734c67c5e6897fb2e318
+c7922d6945718561529291df36fba352711673b65485532d9304a19f46803c0e
