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

(Adding Dave so that he is also aware of this) Stephen Rothwell 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

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

(Adding Dave so that he is also aware of this) Stephen Rothwell 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

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

Hi all, On Thu, 24 Aug 2017 11:17:53 +1000 Stephen Rothwell 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]

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

Hi all, On Thu, 24 Aug 2017 11:17:53 +1000 Stephen Rothwell 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):

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

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:

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

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:

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

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

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

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

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

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:

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

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:

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

Stephen Rothwell 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'

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

Stephen Rothwell 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: > >

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

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

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

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

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

Kalle Valo writes: > Stephen Rothwell 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'

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

Stephen Rothwell 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: > >

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

Stephen Rothwell 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

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

Kalle Valo writes: > Stephen Rothwell 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

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

Hi Kalle, 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

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

Hi Kalle, 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

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

Hi Kalle, Today's linux-next merge of the wireless-drivers-next tree got a conflict in drivers/net/wireless/rtlwifi/pci.c between commit e9538cf4f907 ("rtlwifi: Fix error when accessing unmapped memory in skb") from Linus' tree and commit d0311314d002 ("rtlwifi: rtl8192ee: Fix handling of new

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

Hi Kalle, Today's linux-next merge of the wireless-drivers-next tree got a conflict in drivers/net/wireless/rtlwifi/pci.c between commit e9538cf4f907 (rtlwifi: Fix error when accessing unmapped memory in skb) from Linus' tree and commit d0311314d002 (rtlwifi: rtl8192ee: Fix handling of new style