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

[Mark Brown]

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/cfg/a000.c

between commit:

  44fd09dad5d2b78ef ("iwlwifi: nvm: set the correct offsets to 3168 series")

from the wireless-drivers tree and commit:

   dd05f9aab4426ff1 ("iwlwifi: pcie: dynamic Tx command queue size")

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.

diff --cc drivers/net/wireless/intel/iwlwifi/cfg/a000.c
index a440140ed8dd,076f8d6d1124..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
@@@ -133,17 -133,18 +133,18 @@@ static const struct iwl_ht_params iwl_a
  	.use_tfh = true,						\
  	.rf_id = true,							\
  	.gen2 = true,							\
 -	.ext_nvm = true,						\
 +	.nvm_type = IWL_NVM_EXT,					\
- 	.dbgc_supported = true
+ 	.dbgc_supported = true,						\
+ 	.tx_cmd_queue_size = 32
  
  const struct iwl_cfg iwla000_2ac_cfg_hr = {
- 		.name = "Intel(R) Dual Band Wireless AC a000",
- 		.fw_name_pre = IWL_A000_HR_FW_PRE,
- 		IWL_DEVICE_A000,
- 		.ht_params = &iwl_a000_ht_params,
- 		.nvm_ver = IWL_A000_NVM_VERSION,
- 		.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
- 		.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
+ 	.name = "Intel(R) Dual Band Wireless AC a000",
+ 	.fw_name_pre = IWL_A000_HR_FW_PRE,
+ 	IWL_DEVICE_A000,
+ 	.ht_params = &iwl_a000_ht_params,
+ 	.nvm_ver = IWL_A000_NVM_VERSION,
+ 	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
+ 	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
  };
  
  const struct iwl_cfg iwla000_2ac_cfg_hr_cdb = {

Attachment: signature.asc
Description: PGP signature