Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-05-21--00-00 (v6.15-rc6-1381-g37475076c20e) remotes/brancher/net-next-2025-05-21--03-00 (v6.15-rc6-1406-g43ab74ed4f5c) ==== BASE DIFF ==== MAINTAINERS | 3 +- arch/m68k/coldfire/m5272.c | 2 +- arch/mips/bcm47xx/setup.c | 2 +- drivers/net/dsa/dsa_loop.c | 2 +- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 9 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 277 ++++++++++++------ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 32 +- drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 +- drivers/net/ethernet/faraday/ftgmac100.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 3 +- drivers/net/ethernet/intel/ice/ice_lag.c | 6 + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 1 - drivers/net/ethernet/intel/idpf/idpf.h | 2 + drivers/net/ethernet/intel/idpf/idpf_lib.c | 10 +- drivers/net/ethernet/meta/fbnic/fbnic_devlink.c | 6 +- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 17 +- drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 3 +- drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 5 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/mdio/of_mdio.c | 2 +- drivers/net/netdevsim/netdev.c | 2 + drivers/net/phy/fixed_phy.c | 12 +- drivers/net/phy/mediatek/Kconfig | 15 +- drivers/net/phy/mediatek/Makefile | 3 +- drivers/net/phy/mediatek/mtk-2p5ge.c | 321 +++++++++++++++++++++ drivers/net/phy/realtek/realtek_main.c | 2 + drivers/net/usb/lan78xx.c | 2 +- include/linux/phy_fixed.h | 18 +- include/net/netdev_lock.h | 18 +- net/core/dev.c | 10 +- net/sctp/socket.c | 3 +- tools/testing/selftests/drivers/net/team/Makefile | 2 +- tools/testing/selftests/drivers/net/team/config | 1 + .../selftests/drivers/net/team/propagation.sh | 80 +++++ tools/testing/selftests/nci/nci_dev.c | 2 +- .../testing/selftests/net/srv6_end_flavors_test.sh | 4 +- 38 files changed, 727 insertions(+), 160 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.4dG5dI15An b/tmp/tmp.wOMkz6fRkq index 907326b96731..8d92813c90b7 100644 --- a/tmp/tmp.4dG5dI15An +++ b/tmp/tmp.wOMkz6fRkq @@ -6,6 +6,32 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +net/enic: Allow at least 8 RQs to always be used +selftest/net/ovpn: fix TCP socket creation +ovpn: ensure sk is still valid during cleanup +ovpn: properly deconfigure UDP-tunnel +net: dsa: microchip: Add SGMII port support to KSZ9477 switch +vsock/test: Add test for an unexpectedly lingering close() +vsock/test: Introduce enable_so_linger() helper +vsock/test: Introduce vsock_wait_sent() helper +vsock: Move lingering logic to af_vsock core +vsock/virtio: Linger on unsent data +libeth: xdp, xsk: access adjacent u32s as u64 where applicable +libeth: xsk: add XSkFQ refill and XSk wakeup helpers +libeth: xsk: add XSk Rx processing support +libeth: xsk: add XSk xmit functions +libeth: xsk: add XSk XDP_TX sending helpers +libeth: xdp: add RSS hash hint and XDP features setup helpers +libeth: xdp: add templates for building driver-side callbacks +libeth: xdp: add XDP prog run and verdict result handling +libeth: xdp: add helpers for preparing/processing &libeth_xdp_buff +libeth: xdp: add XDPSQ cleanup timers +libeth: xdp: add XDPSQ locking helpers +libeth: xdp: add XDPSQE completion helpers +libeth: xdp: add .ndo_xdp_xmit() helpers +libeth: xdp: add XDP_TX buffers sending +libeth: support native XDP and register memory model +libeth: convert to netmem Revert "bnxt_en: bring back rtnl_lock() in the bnxt_open() path" udp_tunnel: remove rtnl_lock dependency net: ASSERT_RTNL remove netif_set_real_num_{rx,tx}_queues @@ -37,17 +63,12 @@ net: dlink: Correct endian treatment of t_SROM data idpf: fix idpf_vport_splitq_napi_poll() net: add debug checks in ____napi_schedule() and napi_poll() net: usb: aqc111: fix error handling of usbnet read calls -virtio_net: Enforce minimum TX ring size for reliability -virtio_ring: Fix error reporting in virtqueue_resize hinic3: module initialization and tx/rx logic net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done nfc: Correct Samsung "Electronics" spelling in copyright headers eth: bnxt: fix deadlock when xdp is attached or detached octeontx2-af: NPC: Clear Unicast rule on nixlf detach rtase: Use min() instead of min_t() -idpf: fix null-ptr-deref in idpf_features_check -ice: Fix LACP bonds without SRIOV environment -ice: fix vf->num_mac count with port representors selftest: af_unix: Test SO_PASSRIGHTS. af_unix: Introduce SO_PASSRIGHTS. af_unix: Inherit sk_flags at connect(). @@ -57,9 +78,6 @@ tcp: Restrict SO_TXREHASH to TCP socket. scm: Move scm_recv() from scm.h to scm.c. af_unix: Don't pass struct socket to maybe_add_creds(). af_unix: Factorise test_bit() for SOCK_PASSCRED and SOCK_PASSPIDFD. -bnxt_en: Update MRU and RSS table of RSS contexts on queue reset -bnxt_en: Add a helper function to configure MRU and RSS -bnxt_en: Fix netdev locking in ULP IRQ functions net: remove skb_copy_and_hash_datagram_iter() nvme-tcp: use crc32c() and skb_copy_and_crc32c_datagram_iter() net: add skb_copy_and_crc32c_datagram_iter() @@ -70,14 +88,8 @@ RDMA/siw: use skb_crc32c() instead of __skb_checksum() net: use skb_crc32c() in skb_crc32c_csum_help() net: add skb_crc32c() net: introduce CONFIG_NET_CRC32C -net: dwmac-sun8i: Use parsed internal PHY address instead of 1 net: mana: Add support for Multi Vports on Bare metal emulex/benet: correct command version selection in be_cmd_get_stats() -net: bcmgenet: expose more stats in ethtool -net: bcmgenet: count hw discarded packets in missed stat -net: bcmgenet: switch to use 64bit statistics -net: mlx5: vport: Add error handling in mlx5_query_nic_vport_node_guid() -net: mlx5: vport: Add error handling in mlx5_query_nic_vport_qkey_viol_cntr() net: Add support for providing the PTP hardware source in tsinfo net: bonding: add tracepoint for 802.3ad net: bonding: send peer notify when failure recovery @@ -88,16 +100,12 @@ net: libwx: Fix log level selftests/tc-testing: Add an HFSC qlen accounting test sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() hv_netvsc: fix potential deadlock in netvsc_vf_setxdp() -net: phy: fixed_phy: constify status argument where possible -net: phy: fixed_phy: remove irq argument from fixed_phy_register -net: phy: fixed_phy: remove irq argument from fixed_phy_add dt-bindings: net: Document support for Aeonsemi PHYs net: phy: Add support for Aeonsemi AS21xxx PHYs net: phy: introduce genphy_match_phy_device() net: phy: nxp-c45-tja11xx: simplify .match_phy_device OP net: phy: bcm87xx: simplify .match_phy_device OP net: phy: pass PHY driver to .match_phy_device OP -net: let lockdep compare instance locks wireguard: allowedips: Add WGALLOWEDIP_F_REMOVE_ME flag net: hibmcge: fix wrong ndo.open() after reset fail issue. net: hibmcge: fix incorrect statistics update issue @@ -107,20 +115,10 @@ socket: Remove kernel socket conversion except for net/rds/. socket: Restore sock_create_kern(). socket: Rename sock_create_kern() to __sock_create_kern(). socket: Un-export __sock_create(). -selftests: net: Fix spellings -net: devmem: remove min_t(iter_iov_len) in sendmsg -selftests: net: validate team flags propagation xsk: Bring back busy polling support in XDP_COPY -eth: fbnic: Replace kzalloc/fbnic_fw_init_cmpl with fbnic_fw_alloc_cmpl -net: ethernet: ti: am65-cpsw: Lower random mac address error print to info -net: phy: mediatek: add driver for built-in 2.5G ethernet PHY on MT7988 -net: phy: mediatek: Sort config and file names in Kconfig and Makefile -sctp: Do not wake readers in __sctp_write_space() net: airoha: ppe: Disable packet keepalive net: airoha: Add FLOW_CLS_STATS callback support net: airoha: npu: Move memory allocation in airoha_npu_send_msg() caller -net: phy: realtek: add RTL8127-internal PHY -net: enetc: fix the error handling in enetc4_pf_netdev_create() net: lan743x: Restore SGMII CTRL register on resume ipv6: Revert two per-cpu var allocation for RTM_NEWROUTE. ipv6: Pass gfp_flags down to ip6_route_info_create_nh().