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

diff --git a/a/1.txt b/N1/1.txt
index 2db52f9..5543c8f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,13 +12,14 @@ greearb@candelatech.com writes:
 >  drivers/net/wireless/ath/ath10k/mac.c | 5 +++--
 >  1 file changed, 3 insertions(+), 2 deletions(-)
 >
-> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
+> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless=
+/ath/ath10k/mac.c
 > index cd3016d..42cac32 100644
 > --- a/drivers/net/wireless/ath/ath10k/mac.c
 > +++ b/drivers/net/wireless/ath/ath10k/mac.c
 > @@ -3432,8 +3432,9 @@ static int ath10k_mac_tx_submit(struct ath10k *ar,
 >  	}
->  
+> =20
 >  	if (ret) {
 > -		ath10k_warn(ar, "failed to transmit packet, dropping: %d\n",
 > -			    ret);
@@ -33,22 +34,18 @@ that function should be fixed, not the callers.
 
 void ath10k_warn(struct ath10k *ar, const char *fmt, ...)
 {
-	struct va_format vaf = {
-		.fmt = fmt,
+	struct va_format vaf =3D {
+		.fmt =3D fmt,
 	};
 	va_list args;
 
 	va_start(args, fmt);
-	vaf.va = &args;
+	vaf.va =3D &args;
 	dev_warn_ratelimited(ar->dev, "%pV", &vaf);
 	trace_ath10k_log_warn(ar, &vaf);
 
 	va_end(args);
 }
 
--- 
-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 474990c..89d2614 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,8 +4,8 @@
  "Subject\0Re: [PATCH v2 04/21] ath10k: rate-limit packet tx errors\0"
  "Date\0Wed, 14 Sep 2016 14:07:55 +0000\0"
  "To\0greearb@candelatech.com <greearb@candelatech.com>\0"
- "Cc\0linux-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>"
+ " linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "greearb@candelatech.com writes:\n"
@@ -22,13 +22,14 @@
  ">  drivers/net/wireless/ath/ath10k/mac.c | 5 +++--\n"
  ">  1 file changed, 3 insertions(+), 2 deletions(-)\n"
  ">\n"
- "> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c\n"
+ "> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless=\n"
+ "/ath/ath10k/mac.c\n"
  "> index cd3016d..42cac32 100644\n"
  "> --- a/drivers/net/wireless/ath/ath10k/mac.c\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/mac.c\n"
  "> @@ -3432,8 +3432,9 @@ static int ath10k_mac_tx_submit(struct ath10k *ar,\n"
  ">  \t}\n"
- ">  \n"
+ "> =20\n"
  ">  \tif (ret) {\n"
  "> -\t\tath10k_warn(ar, \"failed to transmit packet, dropping: %d\\n\",\n"
  "> -\t\t\t    ret);\n"
@@ -43,24 +44,20 @@
  "\n"
  "void ath10k_warn(struct ath10k *ar, const char *fmt, ...)\n"
  "{\n"
- "\tstruct va_format vaf = {\n"
- "\t\t.fmt = fmt,\n"
+ "\tstruct va_format vaf =3D {\n"
+ "\t\t.fmt =3D fmt,\n"
  "\t};\n"
  "\tva_list args;\n"
  "\n"
  "\tva_start(args, fmt);\n"
- "\tvaf.va = &args;\n"
+ "\tvaf.va =3D &args;\n"
  "\tdev_warn_ratelimited(ar->dev, \"%pV\", &vaf);\n"
  "\ttrace_ath10k_log_warn(ar, &vaf);\n"
  "\n"
  "\tva_end(args);\n"
  "}\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=
 
-cf3bf69de6f63858831e2b08fd1c688c0455ffb082604355459da8fa6d79c679
+a1c0488c8b020701726b44bbbdaf958c07023a3499817a4bdc7b57dadb7ac79b
