Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bluetooth/btusb.c
index ed455de598eae715f549d37f7faef631061e9b76,ba41490543040a723bbdb868626225be0612846d..a9c35ebb30f86963009cbf76b30d6582215a15a0
--- 1/drivers/bluetooth/btusb.c
--- 2/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -1201,18 -1173,7 +1204,14 @@@ static int btusb_open(struct hci_dev *h
        }
  
        data->intf->needs_remote_wakeup = 1;
-       /* device specific wakeup source enabled and required for USB
-        * remote wakeup while host is suspended
-        */
-       device_wakeup_enable(&data->udev->dev);
  
 +      /* Disable device remote wakeup when host is suspended
 +       * For Realtek chips, global suspend without
 +       * SET_FEATURE (DEVICE_REMOTE_WAKEUP) can save more power in device.
 +       */
 +      if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags))
 +              device_wakeup_disable(&data->udev->dev);
 +
        if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
                goto done;
  
@@@ -1276,12 -1237,6 +1275,11 @@@ static int btusb_close(struct hci_dev *
                goto failed;
  
        data->intf->needs_remote_wakeup = 0;
-       device_wakeup_disable(&data->udev->dev);
 +
 +      /* Enable remote wake up for auto-suspend */
 +      if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags))
 +              data->intf->needs_remote_wakeup = 1;
 +
        usb_autopm_put_interface(data->intf);
  
  failed:

diff --cc drivers/bluetooth/hci_qca.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
index ad802a8909e0d4423785592ba3e87cc92191b466,a3b6d8c89127f1a2fcfdfb84a1824dbbedc019e6..a37dcd140f63c1ea06f83b7189b3d37d07398625
--- 1/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
--- 2/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
@@@ -697,19 -682,10 +691,17 @@@ bool ixgbe_clean_xdp_tx_irq(struct ixgb
        if (xsk_frames)
                xsk_umem_complete_tx(umem, xsk_frames);
  
-       xmit_done = ixgbe_xmit_zc(tx_ring, q_vector->tx.work_limit);
- 
-       return budget > 0 && xmit_done;
 +      if (xsk_umem_uses_need_wakeup(tx_ring->xsk_umem)) {
 +              if (tx_ring->next_to_clean == tx_ring->next_to_use)
 +                      xsk_set_tx_need_wakeup(tx_ring->xsk_umem);
 +              else
 +                      xsk_clear_tx_need_wakeup(tx_ring->xsk_umem);
 +      }
 +
+       return ixgbe_xmit_zc(tx_ring, q_vector->tx.work_limit);
  }
  
 -int ixgbe_xsk_async_xmit(struct net_device *dev, u32 qid)
 +int ixgbe_xsk_wakeup(struct net_device *dev, u32 qid, u32 flags)
  {
        struct ixgbe_adapter *adapter = netdev_priv(dev);
        struct ixgbe_ring *ring;

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/nvidia/forcedeth.c
Simple merge

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

diff --cc drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index f84a7df296ea7b209dabc5091ac0610a559d3094,6117e6ca08cb7cf6cedb6b46b9a426f1bd0d0b10..7705e55aa3d1728e2c3eaff69b16be9bc6d9827e
--- 1/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
--- 2/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@@ -67,9 -91,9 +80,9 @@@ static const struct ieee80211_ops mt76x
        .configure_filter = mt76x02_configure_filter,
        .bss_info_changed = mt76x02_bss_info_changed,
        .sta_state = mt76_sta_state,
-       .set_key = mt76x02_set_key,
+       .set_key = mt76x0e_set_key,
        .conf_tx = mt76x02_conf_tx,
 -      .sw_scan_start = mt76x02_sw_scan,
 +      .sw_scan_start = mt76_sw_scan,
        .sw_scan_complete = mt76x02_sw_scan_complete,
        .ampdu_action = mt76x02_ampdu_action,
        .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/bridge/br_mdb.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/core/sock_map.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/netfilter/nf_flow_table_core.c
Simple merge

diff --cc net/rds/bind.c
Simple merge

diff --cc net/sctp/protocol.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/tipc/name_distr.c
Simple merge