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

Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/intel/iwlwifi/mvm/tx.c > > between commit: > > 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len") > > from the wireless-drivers tree and commit: > > d8

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/tx.c between commit: 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len") from the wireless-drivers tree and commit: d8fe484470dd ("iwlwifi: mvm: add supp

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

Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/fw.c between commit: 905e36ae172c ("iwlwifi: mvm: Fix paging memory leak") from the wireless-drivers tree and commit: 43413a975d06 ("iwlwifi: mvm: support rss queues configura