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

On Thu, Mar 22, 2018 at 1:53 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/mac80211/debugfs.c > include/net/mac80211.h > > between commit: > > 7c181f4fcdc6 ("mac80211: add ieee80211_hw flag for QoS NDP support") > > from

linux-next: manual merge of the net-next tree with the mac80211 tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mac80211/debugfs.c include/net/mac80211.h between commit: 7c181f4fcdc6 ("mac80211: add ieee80211_hw flag for QoS NDP support") from the mac80211 tree and commit: 94ba92713f83 ("mac80211: Call mgd_prep_tx befo