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

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

[Stephen Rothwell]

Hi all,

As expetced, today's linux-next merge of the wireless-drivers-next tree
got a conflict in:

  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

between commit:

  92b0f7b26b31 ("iwlwifi: split the regulatory rules when the bandwidth flags require it")

from Linus' tree and commit:

  b823cf3bae81 ("iwlwifi: update channel flags parser")

from the wireless-drivers-next tree.

I fixed it up (see below - Luca, Kalle, thanks for the heads up) 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/iwl-nvm-parse.c
index 3ee6767392b6,aa382f719988..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@@ -864,11 -908,11 +911,11 @@@ iwl_parse_nvm_mcc_info(struct device *d
  		rule->flags |= NL80211_RRF_AUTO_BW;
  		rule->freq_range.max_bandwidth_khz = 0;
  
 -		prev_ch_flags = ch_flags;
  		prev_center_freq = center_freq;
 +		prev_reg_rule_flags = reg_rule_flags;
  
  		IWL_DEBUG_DEV(dev, IWL_DL_LAR,
- 			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n",
 -			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x): %s\n",
++			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n"
  			      center_freq,
  			      band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
  			      CHECK_AND_PRINT_I(VALID),
@@@ -878,9 -926,8 +929,8 @@@
  			      CHECK_AND_PRINT_I(40MHZ),
  			      CHECK_AND_PRINT_I(80MHZ),
  			      CHECK_AND_PRINT_I(160MHZ),
- 			      CHECK_AND_PRINT_I(INDOOR_ONLY),
- 			      CHECK_AND_PRINT_I(GO_CONCURRENT),
+ 			      CHECK_AND_PRINT_I(DC_HIGH),
 -			      ch_flags,
 +			      ch_flags, reg_rule_flags,
  			      ((ch_flags & NVM_CHANNEL_ACTIVE) &&
  			       !(ch_flags & NVM_CHANNEL_RADAR))
  					 ? "Ad-Hoc" : "");

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

[Stephen Rothwell]

Hi all,

On Thu, 24 Aug 2017 11:17:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>   		IWL_DEBUG_DEV(dev, IWL_DL_LAR,
> - 			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n",
>  -			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x): %s\n",
> ++			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n"

Rats! I missed the comma ... I have added it back.

-- 
Cheers,
Stephen Rothwell

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

[Kalle Valo]

(Adding Dave so that he is also aware of this)

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> As expetced, today's linux-next merge of the wireless-drivers-next tree
> got a conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
>
> between commit:
>
>   92b0f7b26b31 ("iwlwifi: split the regulatory rules when the bandwidth flags require it")
>
> from Linus' tree and commit:
>
>   b823cf3bae81 ("iwlwifi: update channel flags parser")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below - Luca, Kalle, thanks for the heads up) 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.

Thanks for the report. There were quite a few conflicts in iwlwifi so
I'm planning to merge wireless-drivers to wireless-drivers-next today so
that the conflicts are fixed before I submit them to Dave.

-- 
Kalle Valo

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

[Stephen Rothwell]

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

between commit:

  a600852a9d00 ("iwlwifi: mvm: don't WARN when a legit race happens in A-MPDU")

from Linus' tree and commit:

  790e663433d8 ("iwlwifi: mvm: include more debug data when we get an unexpected baid")

from the wireless-drivers-next tree.

I fixed it up (I just used the former) 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

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

[Stephen Rothwell]

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/mvm/rs.c

between commit:

  87f55616f81b ("iwlwifi: mvm: rs: fix TLC statistics collection")

from Linus' tree and commit:

  482e48440a0e ("iwlwifi: mvm: change open and close criteria of a BA session")

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/rs.c
index 8999a1199d60,44c873082a31..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
@@@ -1312,7 -1357,8 +1357,8 @@@ void iwl_mvm_rs_tx_status(struct iwl_mv
  		if (info->status.ampdu_ack_len == 0)
  			info->status.ampdu_len = 1;
  
- 		rs_collect_tlc_data(mvm, lq_sta, curr_tbl, tx_resp_rate.index,
+ 		rs_collect_tlc_data(mvm, mvmsta, tid, curr_tbl,
 -				    lq_rate.index,
++				    tx_resp_rate.index,
  				    info->status.ampdu_len,
  				    info->status.ampdu_ack_len);
  
@@@ -1348,11 -1394,11 +1394,11 @@@
  				continue;
  
  			rs_collect_tpc_data(mvm, lq_sta, tmp_tbl,
 -					    lq_rate.index, 1,
 +					    tx_resp_rate.index, 1,
  					    i < retries ? 0 : legacy_success,
  					    reduced_txp);
- 			rs_collect_tlc_data(mvm, lq_sta, tmp_tbl,
+ 			rs_collect_tlc_data(mvm, mvmsta, tid, tmp_tbl,
 -					    lq_rate.index, 1,
 +					    tx_resp_rate.index, 1,
  					    i < retries ? 0 : legacy_success);
  		}
  

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

[Stephen Rothwell]

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/mvm/ops.c

between commit:

  bf8b286f86fc ("iwlwifi: mvm: defer setting IWL_MVM_STATUS_IN_HW_RESTART")

from Linus' tree and commit:

  7174beb60c53 ("iwlwifi: refactor firmware debug code")

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/ops.c
index 9c175d5e9d67,c387d5095bfe..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@@ -1234,9 -1190,10 +1190,9 @@@ void iwl_mvm_nic_restart(struct iwl_mv
  	 * can't recover this since we're already half suspended.
  	 */
  	if (!mvm->fw_restart && fw_error) {
- 		iwl_mvm_fw_dbg_collect_desc(mvm, &iwl_mvm_dump_desc_assert,
+ 		iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,
  					NULL);
 -	} else if (test_and_set_bit(IWL_MVM_STATUS_IN_HW_RESTART,
 -				    &mvm->status)) {
 +	} else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
  		struct iwl_mvm_reprobe *reprobe;
  
  		IWL_ERR(mvm,

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

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/mvm/ops.c
>
> between commit:
>
>   bf8b286f86fc ("iwlwifi: mvm: defer setting IWL_MVM_STATUS_IN_HW_RESTART")
>
> from Linus' tree and commit:
>
>   7174beb60c53 ("iwlwifi: refactor firmware debug code")
>
> 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.

Thanks, the resolution looks good. I'll notify Dave about this when I
send the wireless-drivers-next pull request to him.

-- 
Kalle Valo

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

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/ath/ath10k/pci.c
>
> between commit:
>
>   6419fdbb6f90 ("ath10k: poll HTT send completion when CE 5 is unused")
>
> from Linus' tree and commit:
>
>   afb0bf7f530b ("ath10k: add support for pktlog in QCA99X0")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks, the fix looks good to me.

-- 
Kalle Valo

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

[Kalle Valo]

Kalle Valo <kvalo@codeaurora.org> writes:

> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> Today's linux-next merge of the wireless-drivers-next tree got a
>> conflict in:
>>
>>   drivers/net/wireless/ath/ath10k/pci.c
>>
>> between commit:
>>
>>   6419fdbb6f90 ("ath10k: poll HTT send completion when CE 5 is unused")
>>
>> from Linus' tree and commit:
>>
>>   afb0bf7f530b ("ath10k: add support for pktlog in QCA99X0")
>>
>> from the wireless-drivers-next tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Thanks, the fix looks good to me.

BTW, this conflict should be fixed once Dave merges my
wireless-drivers-next pull request.

-- 
Kalle Valo