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

We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.

Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444a4 ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/b53/b53_common.c
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/dsa/ocelot/felix.c
Simple merge

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

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

diff --cc drivers/net/ethernet/broadcom/bcmsysport.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index cb3083d2b4abc46087d34b0095aa2cd98ade15f3,cf5383bb83319a5e4bd81c1985835d81acc4ee43..ceaf76158e232978fa340e4e94afca6e9330fc98
--- 1/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
--- 2/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@@ -377,12 -376,12 +377,12 @@@ static u32 dpaa2_eth_run_xdp(struct dpa
                break;
        default:
                bpf_warn_invalid_xdp_action(xdp_act);
-               /* fall through */
+               fallthrough;
        case XDP_ABORTED:
                trace_xdp_exception(priv->net_dev, xdp_prog, xdp_act);
-               /* fall through */
+               fallthrough;
        case XDP_DROP:
 -              xdp_release_buf(priv, ch, addr);
 +              dpaa2_eth_xdp_release_buf(priv, ch, addr);
                ch->stats.xdp_drop++;
                break;
        case XDP_REDIRECT:

diff --cc drivers/net/ethernet/hisilicon/hns/hns_enet.c
Simple merge

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

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
index 994358689de9920c1ed8fe85f358eb9084c7d81b,d3a774331afc7a71eab32652f214b4c3751f8cd5..6b619c1902390789c785ada773be2ead9778dd70
--- 1/drivers/net/ethernet/ibm/ibmvnic.c
--- 2/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@@ -467,12 -475,17 +467,15 @@@ static int init_stats_token(struct ibmv
  static int reset_rx_pools(struct ibmvnic_adapter *adapter)
  {
        struct ibmvnic_rx_pool *rx_pool;
 +      u64 buff_size;
        int rx_scrqs;
        int i, j, rc;
 -      u64 *size_array;
  
 -      size_array = (u64 *)((u8 *)(adapter->login_rsp_buf) +
 -              be32_to_cpu(adapter->login_rsp_buf->off_rxadd_buff_size));
 -
 -      rx_scrqs = be32_to_cpu(adapter->login_rsp_buf->num_rxadd_subcrqs);
+       if (!adapter->rx_pool)
+               return -1;
+ 
 +      buff_size = adapter->cur_rx_buf_sz;
 +      rx_scrqs = adapter->num_active_rx_pools;
        for (i = 0; i < rx_scrqs; i++) {
                rx_pool = &adapter->rx_pool[i];
  
@@@ -637,7 -652,10 +640,10 @@@ static int reset_tx_pools(struct ibmvni
        int tx_scrqs;
        int i, rc;
  
 -      tx_scrqs = be32_to_cpu(adapter->login_rsp_buf->num_txsubm_subcrqs);
+       if (!adapter->tx_pool)
+               return -1;
+ 
 +      tx_scrqs = adapter->num_active_tx_pools;
        for (i = 0; i < tx_scrqs; i++) {
                rc = reset_one_tx_pool(adapter, &adapter->tso_pool[i]);
                if (rc)

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/flower/offload.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_txrx.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_dev.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_main.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge

diff --cc drivers/net/ethernet/sfc/farch.c
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/net/usb/Kconfig
Simple merge

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

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

diff --cc drivers/s390/net/qeth_l2_main.c
Simple merge

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc fs/io_uring.c
Simple merge

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

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

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

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

diff --cc net/batman-adv/bat_v_ogm.c
Simple merge

diff --cc net/batman-adv/bridge_loop_avoidance.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/netlabel/netlabel_domainhash.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/netlink/policy.c
Simple merge

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

diff --cc net/socket.c
Simple merge

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

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge