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

diff --git a/a/1.txt b/N1/1.txt
index d503e0f..a274b91 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,14 +4,15 @@ Adrian Chadd <adrian@freebsd.org> writes:
 >>>> +++ b/drivers/net/wireless/ath/ath10k/core.c
 >>>> @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t
 >>>> priv_size, struct device *dev,
->>>>      ar->hw_rev = hw_rev;
->>>>      ar->hif.ops = hif_ops;
->>>>      ar->hif.bus = bus;
->>>> +    ar->debug_mask = ath10k_debug_mask;
->>>> +    ar->trace_debug_mask = ath10k_debug_mask;
+>>>>      ar->hw_rev =3D hw_rev;
+>>>>      ar->hif.ops =3D hif_ops;
+>>>>      ar->hif.bus =3D bus;
+>>>> +    ar->debug_mask =3D ath10k_debug_mask;
+>>>> +    ar->trace_debug_mask =3D ath10k_debug_mask;
 >>>
 >>> Until now tracing has been always enabled, irrespective what debug_mask
->>> has contained. Now you are changing that and by default log messages are
+>>> has contained. Now you are changing that and by default log messages ar=
+e
 >>> not delivered through tracing until user enables them. So I think to
 >>> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY
 >>> (0xffffffff) by default and the user can modify the mask per device via
@@ -51,9 +52,5 @@ We could of course always change ath10k_dbg()/ath10k_dbg_dump() to
 inline functions (or maybe even cpp macros) but if va_start()/va_end()
 are the expensive part that won't help.
 
--- 
-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 c2d0f3b..a7855d0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,8 +7,8 @@
  "Date\0Thu, 1 Jun 2017 13:34:29 +0000\0"
  "To\0Adrian Chadd <adrian@freebsd.org>\0"
  "Cc\0Arend van Spriel <arend.vanspriel@broadcom.com>"
-  linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>
- " ath10k@lists.infradead.org <ath10k@lists.infradead.org>\0"
+  ath10k@lists.infradead.org <ath10k@lists.infradead.org>
+ " linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "Adrian Chadd <adrian@freebsd.org> writes:\n"
@@ -17,14 +17,15 @@
  ">>>> +++ b/drivers/net/wireless/ath/ath10k/core.c\n"
  ">>>> @@ -2444,6 +2444,8 @@ struct ath10k *ath10k_core_create(size_t\n"
  ">>>> priv_size, struct device *dev,\n"
- ">>>>      ar->hw_rev = hw_rev;\n"
- ">>>>      ar->hif.ops = hif_ops;\n"
- ">>>>      ar->hif.bus = bus;\n"
- ">>>> +    ar->debug_mask = ath10k_debug_mask;\n"
- ">>>> +    ar->trace_debug_mask = ath10k_debug_mask;\n"
+ ">>>>      ar->hw_rev =3D hw_rev;\n"
+ ">>>>      ar->hif.ops =3D hif_ops;\n"
+ ">>>>      ar->hif.bus =3D bus;\n"
+ ">>>> +    ar->debug_mask =3D ath10k_debug_mask;\n"
+ ">>>> +    ar->trace_debug_mask =3D ath10k_debug_mask;\n"
  ">>>\n"
  ">>> Until now tracing has been always enabled, irrespective what debug_mask\n"
- ">>> has contained. Now you are changing that and by default log messages are\n"
+ ">>> has contained. Now you are changing that and by default log messages ar=\n"
+ "e\n"
  ">>> not delivered through tracing until user enables them. So I think to\n"
  ">>> keep the old behaviour trace_debug_mask should be ATH10K_DBG_ANY\n"
  ">>> (0xffffffff) by default and the user can modify the mask per device via\n"
@@ -64,11 +65,7 @@
  "inline functions (or maybe even cpp macros) but if va_start()/va_end()\n"
  "are the expensive part that won't help.\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=
 
-f9dc16ae2537ff2624cb8956bb40b4ba5307a3b8ffcfc064f3805a3d0a182394
+490ba702fce40b5e2c89a01dfe241c1b601cb30ae1bba103c1fb85c934268fb9
