diff for duplicates of <151632015637.21271.10452415430644852207.stgit@dwillia2-desk3.amr.corp.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 54d9d47..4ba1386 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,12 +5,12 @@ to sanitize txq_params->ac with respect to speculation. I.e. ensure that
 any speculation into ->conf_tx() handlers is done with a value of
 txq_params->ac that is within the bounds of [0, NL80211_NUM_ACS).
 
-Reported-by: Christian Lamparter <chunkeey@gmail.com>
-Reported-by: Elena Reshetova <elena.reshetova@intel.com>
-Cc: Johannes Berg <johannes@sipsolutions.net>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: linux-wireless@vger.kernel.org
-Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+Reported-by: Christian Lamparter <chunkeey-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+Reported-by: Elena Reshetova <elena.reshetova-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
+Cc: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
+Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
+Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+Signed-off-by: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
 ---
  include/linux/nospec.h |   21 +++++++++++++++++++++
  net/wireless/nl80211.c |   10 +++++++---
@@ -79,8 +79,4 @@ index 2b3dbcd40e46..202cb1dc03ee 100644
 -	if (txq_params->ac >= NL80211_NUM_ACS)
 +	idx = array_idx(ac, NL80211_NUM_ACS);
 +	if (!idx)
- 		return -EINVAL;
--
-+	txq_params->ac = *idx;
- 	return 0;
- }
\ No newline at end of file
+ 		return -EINVAL;
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 98a617a..1c2e937 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,10 @@
   "ref\000151632009605.21271.11304291057104672116.stgit\@dwillia2-desk3.amr.corp.intel.com\0"
 ]
 [
-  "From\0Dan Williams <dan.j.williams\@intel.com>\0"
+  "ref\000151632009605.21271.11304291057104672116.stgit-p8uTFz9XbKj2zm6wflaqv1nYeNYlB/vhral2JQCrhuEAvxtiuMwx3w\@public.gmane.org\0"
+]
+[
+  "From\0Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>\0"
 ]
 [
   "Subject\0[PATCH v4 10/10] nl80211: sanitize array index in parse_txq_params\0"
@@ -11,21 +14,21 @@
   "Date\0Thu, 18 Jan 2018 16:02:41 -0800\0"
 ]
 [
-  "To\0linux-kernel\@vger.kernel.org\0"
+  "To\0linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
 ]
 [
-  "Cc\0linux-arch\@vger.kernel.org",
-  " akpm\@linux-foundation.org",
-  " kernel-hardening\@lists.openwall.com",
-  " gregkh\@linuxfoundation.org",
-  " Christian Lamparter <chunkeey\@gmail.com>",
-  " linux-wireless\@vger.kernel.org",
-  " tglx\@linutronix.de",
-  " Johannes Berg <johannes\@sipsolutions.net>",
-  " torvalds\@linux-foundation.org",
-  " David S. Miller <davem\@davemloft.net>",
-  " Elena Reshetova <elena.reshetova\@intel.com>",
-  " alan\@linux.intel.com\0"
+  "Cc\0linux-arch-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b\@public.gmane.org",
+  " kernel-hardening-ZwoEplunGu1jrUoiu81ncdBPR1lH4CV8\@public.gmane.org",
+  " gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r\@public.gmane.org",
+  " Christian Lamparter <chunkeey-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
+  " linux-wireless-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " tglx-hfZtesqFncYOwBW4kG4KsQ\@public.gmane.org",
+  " Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q\@public.gmane.org>",
+  " torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b\@public.gmane.org",
+  " David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q\@public.gmane.org>",
+  " Elena Reshetova <elena.reshetova-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>",
+  " alan-VuQAYsv1563Yd54FQh9/CA\@public.gmane.org\0"
 ]
 [
   "\0000:1\0"
@@ -41,12 +44,12 @@
   "any speculation into ->conf_tx() handlers is done with a value of\n",
   "txq_params->ac that is within the bounds of [0, NL80211_NUM_ACS).\n",
   "\n",
-  "Reported-by: Christian Lamparter <chunkeey\@gmail.com>\n",
-  "Reported-by: Elena Reshetova <elena.reshetova\@intel.com>\n",
-  "Cc: Johannes Berg <johannes\@sipsolutions.net>\n",
-  "Cc: \"David S. Miller\" <davem\@davemloft.net>\n",
-  "Cc: linux-wireless\@vger.kernel.org\n",
-  "Signed-off-by: Dan Williams <dan.j.williams\@intel.com>\n",
+  "Reported-by: Christian Lamparter <chunkeey-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>\n",
+  "Reported-by: Elena Reshetova <elena.reshetova-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>\n",
+  "Cc: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q\@public.gmane.org>\n",
+  "Cc: \"David S. Miller\" <davem-fT/PcQaiUtIeIZ0/mPfg9Q\@public.gmane.org>\n",
+  "Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
+  "Signed-off-by: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>\n",
   "---\n",
   " include/linux/nospec.h |   21 +++++++++++++++++++++\n",
   " net/wireless/nl80211.c |   10 +++++++---\n",
@@ -115,11 +118,7 @@
   "-\tif (txq_params->ac >= NL80211_NUM_ACS)\n",
   "+\tidx = array_idx(ac, NL80211_NUM_ACS);\n",
   "+\tif (!idx)\n",
-  " \t\treturn -EINVAL;\n",
-  "-\n",
-  "+\ttxq_params->ac = *idx;\n",
-  " \treturn 0;\n",
-  " }"
+  " \t\treturn -EINVAL;"
 ]
 
-4c9ad3b7c1299c4ab9cad7ebc0f931db2fa893b8e5a9841892bfc4db9d242f7a
+a4d55f90096597c52a626ddad0b5d5e8eeda0cef375c52cd18ef3d26bc9b7068
