Merge wireless-drivers into wireless-drivers-next

Solve the conflict in main.c early on as there will be a lot more mt76 patches
in the queue.

diff --cc drivers/net/wireless/mediatek/mt76/mt76x0/main.c
index a969fa9,22bc9d3..3f936a8
--- 1/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
--- 2/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
@@@ -78,11 -76,9 +78,10 @@@ static void mt76x0_remove_interface(str
                                     struct ieee80211_vif *vif)
  {
        struct mt76x0_dev *dev = hw->priv;
 -      struct mt76_vif *mvif = (struct mt76_vif *) vif->drv_priv;
 +      struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv;
-       unsigned int wcid = mvif->group_wcid.idx;
  
-       dev->wcid_mask[wcid / BITS_PER_LONG] &= ~BIT(wcid % BITS_PER_LONG);
+       dev->vif_mask &= ~BIT(mvif->idx);
 +      mt76_txq_remove(&dev->mt76, vif->txq);
  }
  
  static int mt76x0_config(struct ieee80211_hw *hw, u32 changed)