linux-next: manual merge of the mac80211-next tree with Linus' tree

Hi Johannes, Today's linux-next merge of the mac80211-next tree got a conflict in: net/mac80211/tx.c between commits: df6ef5d8a87a ("mac80211: fix sequence number assignment for PS response frames") 0b97a484e52c ("mac80211: check skb_linearize() return value") from Linus' tree and commi

linux-next: manual merge of the mac80211-next tree with Linus' tree

Hi Johannes, Today's linux-next merge of the mac80211-next tree got a conflict in: net/mac80211/sta_info.c between commit: 83843c80dcf1 ("mac80211: fix tim recalculation after PS response") from Linus' tree and commit: bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after