Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

mt76 driver had major conflicts within mt7615 directory. To make it easier for
every merge wireless-drivers to wireless-drivers-next and solve those
conflicts.

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/sta.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt7615/usb.c
index f1b4a6316db3836057f1a20e93922bfab8e3d520,5be6704770ad0ca313208f720595ad6d79d83a43..23a21338c46eb7d2da86b26da8c39cc933465681
--- 1/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
--- 2/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
@@@ -129,17 -340,18 +130,17 @@@ alloc_queues
  
        ret = mt76u_alloc_queues(&dev->mt76);
        if (ret)
-               goto error;
+               goto error_free_q;
  
 -      ret = mt7663u_register_device(dev);
 +      ret = mt7663_usb_sdio_register_device(dev);
        if (ret)
-               goto error_freeq;
+               goto error_free_q;
  
        return 0;
  
- error_freeq:
+ error_free_q:
        mt76u_queues_deinit(&dev->mt76);
  error:
 -      mt76u_deinit(&dev->mt76);
        usb_set_intfdata(usb_intf, NULL);
        usb_put_dev(interface_to_usbdev(usb_intf));
  

diff --cc drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/usb.c
Simple merge