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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the wireless-drivers-next tree got a > conflict in: > > drivers/net/wireless/ath/ath10k/mac.c > > between commit: > > f3fe4e93dd63 ("mac80211: add a HW flag for supporting HW TX fragmentation") > > from

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the wireless-drivers-next tree got a > conflict in: > > drivers/net/wireless/ath/ath10k/mac.c > > between commit: > > f3fe4e93dd63 ("mac80211: add a HW flag for supporting HW TX fragmentation") > > from the net-next tree and

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

Hi all, Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/ath/ath10k/mac.c between commit: f3fe4e93dd63 ("mac80211: add a HW flag for supporting HW TX fragmentation") from the net-next tree and commit: ff32eeb86aa1 ("ath10k: advertize

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

Hi all, Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/ath/ath10k/mac.c between commit: f3fe4e93dd63 ("mac80211: add a HW flag for supporting HW TX fragmentation") from the net-next tree and commit: ff32eeb86aa1 ("ath10k: advertize

Re: linux-next: manual merge of the wireless-drivers-next tree with the net-next 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/scan.c > > between commit: > > 7947d3e075cd ("mac80211: Add support for beacon report radio measurement") > > from the

Re: linux-next: manual merge of the wireless-drivers-next tree with the net-next 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/scan.c > > between commit: > > 7947d3e075cd ("mac80211: Add support for beacon report radio measurement") > > from the net-next tree and

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

Hi all, Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/scan.c between commit: 7947d3e075cd ("mac80211: Add support for beacon report radio measurement") from the net-next tree and commit: 69e046423ad7 ("iwlwifi: mvm:

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

Hi all, Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/scan.c between commit: 7947d3e075cd ("mac80211: Add support for beacon report radio measurement") from the net-next tree and commit: 69e046423ad7 ("iwlwifi: mvm:

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

From: Kalle Valo Date: Mon, 16 May 2016 16:10:27 +0300 > I wasn't expecting that skb_info variable is removed. Do we now have > merge damage somewhere? Luca, what do you think? It's possible I got the net --> net-next merge wrong the other day, feel free to send me an

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

From: Kalle Valo Date: Mon, 16 May 2016 16:10:27 +0300 > I wasn't expecting that skb_info variable is removed. Do we now have > merge damage somewhere? Luca, what do you think? It's possible I got the net --> net-next merge wrong the other day, feel free to send me an appropriate fixup.

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

"Coelho, Luciano" writes: (dropping damaged diffs etc, adding Emmanuel as the author of 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len")) >> I wasn't expecting that skb_info variable is removed. Do we now have >> merge damage somewhere? Luca,

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

"Coelho, Luciano" writes: (dropping damaged diffs etc, adding Emmanuel as the author of 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len")) >> I wasn't expecting that skb_info variable is removed. Do we now have >> merge damage somewhere? Luca, what do you think? > > As

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

Hi Kalle, On Mon, 2016-05-16 at 16:10 +0300, Kalle Valo wrote: > (Adding Luca and linux-wireless) > > Stephen Rothwell writes: > > > > > Today's linux-next merge of the wireless-drivers-next tree got a > > conflict in: > > > >  

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

Hi Kalle, On Mon, 2016-05-16 at 16:10 +0300, Kalle Valo wrote: > (Adding Luca and linux-wireless) > > Stephen Rothwell writes: > > > > > Today's linux-next merge of the wireless-drivers-next tree got a > > conflict in: > > > >   drivers/net/wireless/intel/iwlwifi/mvm/tx.c > > > > between

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

(Adding Luca and linux-wireless) Stephen Rothwell writes: > Today's linux-next merge of the wireless-drivers-next tree got a > conflict in: > > drivers/net/wireless/intel/iwlwifi/mvm/tx.c > > between commit: > > 909b27f70643 ("Merge >

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

(Adding Luca and linux-wireless) Stephen Rothwell writes: > Today's linux-next merge of the wireless-drivers-next tree got a > conflict in: > > drivers/net/wireless/intel/iwlwifi/mvm/tx.c > > between commit: > > 909b27f70643 ("Merge >

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

Hi Kalle, Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/tx.c between commit: 909b27f70643 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") from the net-next tree and commit: a525d0eab17d ("Merge tag

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

Hi Kalle, Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/tx.c between commit: 909b27f70643 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") from the net-next tree and commit: a525d0eab17d ("Merge tag

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

Hi Kalle, Today's linux-next merge of the wireless-drivers-next tree got a conflict in drivers/net/wireless/ath/ath10k/mac.c between commits 41fbf6e4f317 ("ath10k: enable IEEE80211_HW_SUPPORT_FAST_XMIT") and df1404650ccb ("mac80211: remove support for IFF_PROMISC") from the net-next tree and

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

Hi Kalle, Today's linux-next merge of the wireless-drivers-next tree got a conflict in drivers/net/wireless/ath/ath10k/mac.c between commits 41fbf6e4f317 (ath10k: enable IEEE80211_HW_SUPPORT_FAST_XMIT) and df1404650ccb (mac80211: remove support for IFF_PROMISC) from the net-next tree and commits