diff for duplicates of <1570614256-@changeid>

diff --git a/a/1.txt b/N1/1.txt
index dc77890..5e3b270 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,28 +1,44 @@
 From: Luca Coelho <luciano.coelho@intel.com>
 
-This is my second patchset with fixes for v5.4.  Just a couple more
-patches I'd like to include in the pull-req I'll send you today.
-
-The changes are:
-
-* Fix initialization of 3168 devices (the infamous BAD_COMMAND bug);
-* Fix recognition of some newer systems with integrated MAC;
-
-As usual, I'm pushing this to a pending branch, for kbuild bot.  I
-will send you a pull-req today with these plus the ones I sent a few
-days ago.
-
-Cheers,
-Luca.
-
-
-Luca Coelho (2):
-  iwlwifi: exclude GEO SAR support for 3168
-  iwlwifi: pcie: change qu with jf devices to use qu configuration
-
- drivers/net/wireless/intel/iwlwifi/mvm/fw.c   |  16 +-
- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 274 +++++++++---------
- 2 files changed, 146 insertions(+), 144 deletions(-)
-
+We currently support two NICs in FW version 29, namely 7265D and 3168.
+Out of these, only 7265D supports GEO SAR, so adjust the function that
+checks for it accordingly.
+
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+Fixes: f5a47fae6aa3 ("iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support")
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+index 0d2229319261..d9eb2b286438 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+@@ -899,15 +899,17 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm)
+ 	 * firmware versions.  Unfortunately, we don't have a TLV API
+ 	 * flag to rely on, so rely on the major version which is in
+ 	 * the first byte of ucode_ver.  This was implemented
+-	 * initially on version 38 and then backported to29 and 17.
+-	 * The intention was to have it in 36 as well, but not all
+-	 * 8000 family got this feature enabled.  The 8000 family is
+-	 * the only one using version 36, so skip this version
+-	 * entirely.
++	 * initially on version 38 and then backported to 17.  It was
++	 * also backported to 29, but only for 7265D devices.  The
++	 * intention was to have it in 36 as well, but not all 8000
++	 * family got this feature enabled.  The 8000 family is the
++	 * only one using version 36, so skip this version entirely.
+ 	 */
+ 	return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 ||
+-	       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 ||
+-	       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17;
++	       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17 ||
++	       (IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 &&
++		((mvm->trans->hw_rev & CSR_HW_REV_TYPE_MSK) ==
++		 CSR_HW_REV_TYPE_7265D));
+ }
+ 
+ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)
 -- 
 2.23.0
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 6ce8db8..476611b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,10 @@
   "From\0Luca Coelho <luca\@coelho.fi>\0"
 ]
 [
-  "Subject\0[PATCH 0/2] iwlwifi: fixes intended for 5.4 2019-10-09\0"
+  "Subject\0[PATCH 1/2] iwlwifi: exclude GEO SAR support for 3168\0"
 ]
 [
-  "Date\0Wed,  9 Oct 2019 12:48:52 +0300\0"
+  "Date\0Wed,  9 Oct 2019 12:48:53 +0300\0"
 ]
 [
   "To\0kvalo\@codeaurora.org\0"
@@ -22,32 +22,48 @@
 [
   "From: Luca Coelho <luciano.coelho\@intel.com>\n",
   "\n",
-  "This is my second patchset with fixes for v5.4.  Just a couple more\n",
-  "patches I'd like to include in the pull-req I'll send you today.\n",
+  "We currently support two NICs in FW version 29, namely 7265D and 3168.\n",
+  "Out of these, only 7265D supports GEO SAR, so adjust the function that\n",
+  "checks for it accordingly.\n",
   "\n",
-  "The changes are:\n",
-  "\n",
-  "* Fix initialization of 3168 devices (the infamous BAD_COMMAND bug);\n",
-  "* Fix recognition of some newer systems with integrated MAC;\n",
-  "\n",
-  "As usual, I'm pushing this to a pending branch, for kbuild bot.  I\n",
-  "will send you a pull-req today with these plus the ones I sent a few\n",
-  "days ago.\n",
-  "\n",
-  "Cheers,\n",
-  "Luca.\n",
-  "\n",
-  "\n",
-  "Luca Coelho (2):\n",
-  "  iwlwifi: exclude GEO SAR support for 3168\n",
-  "  iwlwifi: pcie: change qu with jf devices to use qu configuration\n",
-  "\n",
-  " drivers/net/wireless/intel/iwlwifi/mvm/fw.c   |  16 +-\n",
-  " drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 274 +++++++++---------\n",
-  " 2 files changed, 146 insertions(+), 144 deletions(-)\n",
+  "Signed-off-by: Luca Coelho <luciano.coelho\@intel.com>\n",
+  "Fixes: f5a47fae6aa3 (\"iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support\")\n",
+  "Signed-off-by: Luca Coelho <luciano.coelho\@intel.com>\n",
+  "---\n",
+  " drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 16 +++++++++-------\n",
+  " 1 file changed, 9 insertions(+), 7 deletions(-)\n",
   "\n",
+  "diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c\n",
+  "index 0d2229319261..d9eb2b286438 100644\n",
+  "--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c\n",
+  "+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c\n",
+  "\@\@ -899,15 +899,17 \@\@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm)\n",
+  " \t * firmware versions.  Unfortunately, we don't have a TLV API\n",
+  " \t * flag to rely on, so rely on the major version which is in\n",
+  " \t * the first byte of ucode_ver.  This was implemented\n",
+  "-\t * initially on version 38 and then backported to29 and 17.\n",
+  "-\t * The intention was to have it in 36 as well, but not all\n",
+  "-\t * 8000 family got this feature enabled.  The 8000 family is\n",
+  "-\t * the only one using version 36, so skip this version\n",
+  "-\t * entirely.\n",
+  "+\t * initially on version 38 and then backported to 17.  It was\n",
+  "+\t * also backported to 29, but only for 7265D devices.  The\n",
+  "+\t * intention was to have it in 36 as well, but not all 8000\n",
+  "+\t * family got this feature enabled.  The 8000 family is the\n",
+  "+\t * only one using version 36, so skip this version entirely.\n",
+  " \t */\n",
+  " \treturn IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 ||\n",
+  "-\t       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 ||\n",
+  "-\t       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17;\n",
+  "+\t       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17 ||\n",
+  "+\t       (IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 &&\n",
+  "+\t\t((mvm->trans->hw_rev & CSR_HW_REV_TYPE_MSK) ==\n",
+  "+\t\t CSR_HW_REV_TYPE_7265D));\n",
+  " }\n",
+  " \n",
+  " int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)\n",
   "-- \n",
   "2.23.0"
 ]
 
-27b5f5d6dd9f09832e7f213bb6c103d2ce7fda410caff3a17679e499c69d4367
+b03c86d0b1811796983ffefbe1e78a08b7e8e0d1537c3e761217c60ba2850d94
