Subject: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 31 Oct 2019 11:13:03 +1100

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

between commit:

  3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd")

from the wireless-drivers tree and commit:

  65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 5ca50f39a023,a25712cce4ab..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@@ -1405,12 -1409,12 +1409,18 @@@ static inline bool iwl_mvm_is_scan_ext_
  			  IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER);
  }
  
 +static inline bool iwl_mvm_is_reduced_config_scan_supported(struct iwl_mvm *mvm)
 +{
 +	return fw_has_api(&mvm->fw->ucode_capa,
 +			  IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG);
 +}
 +
+ static inline bool iwl_mvm_is_band_in_rx_supported(struct iwl_mvm *mvm)
+ {
+ 	return fw_has_api(&mvm->fw->ucode_capa,
+ 			   IWL_UCODE_TLV_API_BAND_IN_RX_DATA);
+ }
+ 
  static inline bool iwl_mvm_has_new_rx_stats_api(struct iwl_mvm *mvm)
  {
  	return fw_has_api(&mvm->fw->ucode_capa,