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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:
  e3f02f32a050 ("ionic: fix kernel panic due to multi-buffer handling")
  d9c04209990b ("ionic: Mark error paths in the data path as unlikely")

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

diff --cc Documentation/netlink/specs/ethtool.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma/ti/k3-udma-glue.c
Simple merge

diff --cc drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
Simple merge

diff --cc drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_dev.h
Simple merge

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

diff --cc drivers/net/ethernet/pensando/ionic/ionic_txrx.c
index 5bf13a5d411ce61616f3451b729325ad47fe9928,9fdd7cd3ef19d43836ffb148eea65fc3404c0c09..fc79baad45614994fd775e94c10eea7af37cec28
--- 1/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
--- 2/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
@@@ -593,12 -607,8 +607,8 @@@ static bool ionic_run_xdp(struct ionic_
                break;
  
        case XDP_REDIRECT:
-               /* unmap the pages before handing them to a different device */
-               dma_unmap_page(rxq->dev, buf_info->dma_addr,
-                              IONIC_PAGE_SIZE, DMA_FROM_DEVICE);
- 
                err = xdp_do_redirect(netdev, &xdp_buf, xdp_prog);
 -              if (err) {
 +              if (unlikely(err)) {
                        netdev_dbg(netdev, "xdp_do_redirect err %d\n", err);
                        goto out_xdp_abort;
                }

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

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

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

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

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

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

diff --cc net/unix/af_unix.c
Simple merge

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