From: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Date: Thu, 01 Dec 2016 20:33:37 +0200 > here's another pull request for net-next. Nothing special to mention > about, the details are in the signed tag below. > > This time there's a trivial conflict in > drivers/net/wireless/ath/ath10k/mac.c: > > <<<<<<< HEAD > ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); > ======= > ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); >>>>>>>> d5fb3a138048798ce4cc4b4ced47d07d1794c577 > > We want to have both flags enabled in ath10k. > > I'm planning to submit at least one more pull request, if Linus gives us > one more week I might send even two. For example there are patches to > convert wcn36xx to use the real SMD bus subsystem but they depend on few > arm-soc patches. I'll send a separate email about that, they are not > part of this pull request. > > Please let me know if there are any problems. Pulled, thanks so much for the heads up about the ath10k merge conflict.
