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

2017-08-24 Thread Kalle Valo
(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 r

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

2017-08-23 Thread Stephen Rothwell
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):

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

2017-08-03 Thread Kalle Valo
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: > >

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

2015-12-07 Thread Kalle Valo
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

2015-12-07 Thread Kalle Valo
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: > > afb0bf7f530