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

Conflicts:

drivers/net/ethernet/freescale/fec_main.c
  6ead9c98cafc ("net: fec: remove the xdp_return_frame when lack of tx BDs")
  144470c88c5d ("net: fec: using the standard return codes when xdp xmit errors")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/bxcan.c
Simple merge

diff --cc drivers/net/ethernet/8390/ne.c
Simple merge

diff --cc drivers/net/ethernet/8390/smc-ultra.c
Simple merge

diff --cc drivers/net/ethernet/8390/wd.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
index cd215ab,577d948..6d0b46c
--- 1/drivers/net/ethernet/freescale/fec_main.c
--- 2/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@@ -3798,8 -3798,7 +3798,7 @@@ static int fec_enet_txq_xmit_frame(stru
        entries_free = fec_enet_get_free_txdesc_num(txq);
        if (entries_free < MAX_SKB_FRAGS + 1) {
                netdev_err(fep->netdev, "NOT enough BD for SG!\n");
-               xdp_return_frame(frame);
 -              return NETDEV_TX_BUSY;
 +              return -EBUSY;
        }
  
        /* Fill in a Tx ring entry */

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_sriov.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_vf_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_vf_lib.h
Simple merge

diff --cc drivers/net/ethernet/sun/cassini.c
Simple merge

diff --cc drivers/net/phy/phylink.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
Simple merge

diff --cc drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/mac80211.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/mac.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/mac.h
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/rtw8852b.c
Simple merge

diff --cc include/linux/phy.h
Simple merge

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

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