Merge remote-tracking branch 'wireless-next/master'

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
	drivers/net/wireless/iwlwifi/pcie/drv.c

diff --cc drivers/net/wireless/ath/ath10k/debug.h
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/wmi.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ath9k.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/recv.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/atmel.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index c9b06b4e71f7d5be0f88400d9da26e15cb39e9f9,1b034ea46f932ff4c8aea837b88603861b2e44c0..bfadcb836b6dca4cf6e11279b801d44a2f993360
--- 1/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
--- 2/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@@ -206,17 -210,22 +210,18 @@@ int brcmf_sdio_regrw_helper(struct brcm
   * Returns 0 or error code.
   * NOTE: Async operation is not currently supported.
   */
 -extern int
 -brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, struct sk_buff_head *pktq);
 -extern int
 -brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, u8 *buf, uint nbytes);
 -
 -extern int
 -brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, struct sk_buff *pkt);
 -extern int
 -brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, u8 *buf, uint nbytes);
 -extern int
 -brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                      uint flags, struct sk_buff_head *pktq, uint totlen);
 +int brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, struct sk_buff_head *pktq);
 +int brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, u8 *buf, uint nbytes);
 +
 +int brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, struct sk_buff *pkt);
 +int brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, u8 *buf, uint nbytes);
 +int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                           uint flags, struct sk_buff_head *pktq);
++                          uint flags, struct sk_buff_head *pktq,
++                          uint totlen);
  
  /* Flags bits */
  

diff --cc drivers/net/wireless/iwlwifi/iwl-config.h
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/mvm/rs.h
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
index 26108a1a29fa6d6871cea350aae20820c27d4220,ddf15e1cffa21ad4129c3ce6a1a9441a20f1189c..941c0c88f982639b28436a60e52a0fdc6fba8c4b
--- 1/drivers/net/wireless/iwlwifi/pcie/drv.c
--- 2/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@@ -268,12 -258,10 +268,12 @@@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_c
  #endif /* CONFIG_IWLDVM */
  
  #if IS_ENABLED(CONFIG_IWLMVM)
- /* 7000 Series */
+ /* 7260 Series */
        {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
 +      {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
 +      {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
        {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
@@@ -349,7 -308,9 +349,10 @@@
        {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
        {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
        {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
 +      {IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},
+ 
+ /* 7265 Series */
+       {IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},
  #endif /* CONFIG_IWLMVM */
  
        {0}

diff --cc drivers/net/wireless/iwlwifi/pcie/tx.c
Simple merge

diff --cc include/net/bluetooth/bluetooth.h
Simple merge

diff --cc include/net/bluetooth/hci_core.h
Simple merge

diff --cc include/net/bluetooth/rfcomm.h
Simple merge