Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-02-22--18-00 (v6.14-rc3-770-g9c048d9a083e) remotes/brancher/net-next-2025-02-22--21-00 (v6.14-rc3-792-gb598b396ef48) ==== BASE DIFF ==== .../bindings/net/realtek,rtl9301-mdio.yaml | 86 ++ .../{mfd => net}/realtek,rtl9301-switch.yaml | 63 +- Documentation/netlink/specs/netdev.yaml | 4 + Documentation/netlink/specs/rt_rule.yaml | 5 + Documentation/networking/xsk-tx-metadata.rst | 62 ++ MAINTAINERS | 3 +- drivers/bluetooth/btusb.c | 6 +- drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 9 +- drivers/net/amt.c | 11 +- drivers/net/bareudp.c | 9 +- drivers/net/bonding/bond_netlink.c | 6 +- drivers/net/can/dev/netlink.c | 4 +- drivers/net/can/vxcan.c | 7 +- drivers/net/ethernet/cadence/macb.h | 2 + drivers/net/ethernet/cadence/macb_main.c | 32 +- drivers/net/ethernet/google/gve/gve.h | 16 +- drivers/net/ethernet/google/gve/gve_adminq.c | 66 +- drivers/net/ethernet/google/gve/gve_ethtool.c | 60 +- drivers/net/ethernet/google/gve/gve_main.c | 86 +- drivers/net/ethernet/intel/igc/igc.h | 1 + drivers/net/ethernet/intel/igc/igc_main.c | 143 +++- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 4 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 62 +- drivers/net/ethernet/meta/fbnic/fbnic.h | 3 + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 60 ++ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 4 + drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 6 + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 53 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 3 + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 9 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 14 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 17 +- drivers/net/ethernet/wangxun/Kconfig | 1 + drivers/net/ethernet/wangxun/libwx/Makefile | 2 +- drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 53 ++ drivers/net/ethernet/wangxun/libwx/wx_ethtool.h | 4 + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 19 + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 1 + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 52 +- drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 883 +++++++++++++++++++++ drivers/net/ethernet/wangxun/libwx/wx_ptp.h | 20 + drivers/net/ethernet/wangxun/libwx/wx_type.h | 105 +++ drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 2 + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 20 +- drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 11 + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 5 + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 2 + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 11 + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 10 + drivers/net/geneve.c | 9 +- drivers/net/gtp.c | 10 +- drivers/net/ipvlan/ipvlan.h | 3 +- drivers/net/ipvlan/ipvlan_core.c | 21 +- drivers/net/ipvlan/ipvlan_main.c | 8 +- drivers/net/ipvlan/ipvtap.c | 6 +- drivers/net/loopback.c | 14 + drivers/net/macsec.c | 9 +- drivers/net/macvlan.c | 21 +- drivers/net/macvtap.c | 6 +- drivers/net/mctp/Kconfig | 10 + drivers/net/mctp/Makefile | 1 + drivers/net/mctp/mctp-usb.c | 385 +++++++++ drivers/net/netdevsim/netdev.c | 21 +- drivers/net/netdevsim/netdevsim.h | 1 + drivers/net/netkit.c | 14 +- drivers/net/pfcp.c | 9 +- drivers/net/phy/qcom/qca807x.c | 2 +- drivers/net/phy/qt2025.rs | 2 +- drivers/net/phy/sfp.c | 2 + drivers/net/ppp/ppp_generic.c | 9 +- drivers/net/team/team_core.c | 6 +- drivers/net/tun_vnet.h | 3 +- drivers/net/veth.c | 7 +- drivers/net/vrf.c | 5 +- drivers/net/vxlan/vxlan_core.c | 9 +- drivers/net/wireguard/device.c | 7 +- drivers/net/wireless/virtual/virt_wifi.c | 8 +- drivers/net/wwan/wwan_core.c | 16 +- fs/afs/server.c | 3 + fs/afs/server_list.c | 4 +- include/linux/filter.h | 1 + include/linux/if_macvlan.h | 6 +- include/linux/phy.h | 3 - include/linux/skbuff.h | 12 +- include/linux/usb/mctp-usb.h | 30 + include/net/dst_metadata.h | 7 +- include/net/ip_tunnels.h | 12 +- include/net/rtnetlink.h | 40 +- include/net/sock.h | 11 + include/net/tcp.h | 7 +- include/net/xdp_sock.h | 10 + include/net/xdp_sock_drv.h | 1 + include/trace/events/afs.h | 2 + include/uapi/linux/bpf.h | 30 + include/uapi/linux/fib_rules.h | 1 + include/uapi/linux/if_xdp.h | 10 + include/uapi/linux/netdev.h | 3 + include/uapi/linux/usb/ch9.h | 1 + kernel/bpf/btf.c | 1 + net/8021q/vlan_netlink.c | 9 +- net/batman-adv/soft-interface.c | 9 +- net/bluetooth/l2cap_core.c | 9 +- net/bridge/br_netlink.c | 6 +- net/caif/chnl_net.c | 5 +- net/core/dev.c | 3 +- net/core/dst.c | 6 +- net/core/fib_rules.c | 1 + net/core/filter.c | 80 +- net/core/neighbour.c | 4 +- net/core/netdev-genl.c | 2 + net/core/pktgen.c | 39 +- net/core/rtnetlink.c | 34 +- net/core/skbuff.c | 53 ++ net/core/sock.c | 41 +- net/core/sysctl_net_core.c | 3 +- net/dsa/user.c | 2 +- net/hsr/hsr_netlink.c | 12 +- net/ieee802154/6lowpan/core.c | 7 +- net/ipv4/fib_rules.c | 47 +- net/ipv4/ip_gre.c | 22 +- net/ipv4/ip_tunnel.c | 7 +- net/ipv4/ip_vti.c | 9 +- net/ipv4/ipip.c | 9 +- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_input.c | 2 + net/ipv4/tcp_output.c | 2 + net/ipv6/fib6_rules.c | 45 +- net/ipv6/ip6_gre.c | 26 +- net/ipv6/ip6_tunnel.c | 18 +- net/ipv6/ip6_vti.c | 14 +- net/ipv6/sit.c | 20 +- net/mptcp/subflow.c | 5 +- net/netlink/af_netlink.c | 10 - net/rds/stats.c | 3 +- net/rds/tcp.c | 8 +- net/rxrpc/ar-internal.h | 1 - net/rxrpc/input.c | 2 - net/rxrpc/peer_event.c | 9 +- net/rxrpc/peer_object.c | 5 +- net/rxrpc/rxperf.c | 12 + net/sched/act_tunnel_key.c | 8 +- net/smc/af_smc.c | 5 +- net/socket.c | 2 +- net/sunrpc/svcsock.c | 5 +- net/sunrpc/xprtsock.c | 8 +- net/unix/af_unix.c | 1 - net/xdp/xsk.c | 3 + net/xfrm/xfrm_interface_core.c | 15 +- tools/include/uapi/linux/bpf.h | 30 + tools/include/uapi/linux/if_xdp.h | 10 + tools/include/uapi/linux/netdev.h | 3 + .../selftests/bpf/prog_tests/net_timestamping.c | 239 ++++++ .../testing/selftests/bpf/progs/bpf_tracing_net.h | 1 + .../testing/selftests/bpf/progs/net_timestamping.c | 248 ++++++ tools/testing/selftests/bpf/progs/setget_sockopt.c | 1 + tools/testing/selftests/bpf/xdp_hw_metadata.c | 168 +++- tools/testing/selftests/drivers/net/queues.py | 61 +- tools/testing/selftests/drivers/net/xdp_helper.c | 63 +- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 5 + tools/testing/selftests/net/fib_nexthops.sh | 7 +- tools/testing/selftests/net/fib_rule_tests.sh | 38 + tools/testing/selftests/net/lib/py/__init__.py | 2 +- tools/testing/selftests/net/lib/py/ksft.py | 5 + tools/testing/selftests/net/lib/py/netns.py | 18 + tools/testing/selftests/net/lib/py/utils.py | 72 +- tools/testing/selftests/net/link_netns.py | 141 ++++ tools/testing/selftests/net/netns-name.sh | 10 + 171 files changed, 4239 insertions(+), 480 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.S76Of2wkla b/tmp/tmp.UzY7FP77wq index 58b9d0bf2538..9232f5747694 100644 --- a/tmp/tmp.S76Of2wkla +++ b/tmp/tmp.UzY7FP77wq @@ -3,11 +3,15 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +MAINTAINERS: socket timestamping: add Jason Xing as reviewer tcp: Defer ts_recent changes until req is owned xsk: fix __xsk_generic_xmit() error code when cq is full ipvs: Always clear ipvs_property flag in skb_scrub_packet() tcp: devmem: don't write truncated dmabuf CMSGs to userspace +net: Handle napi_schedule() calls from non-interrupt net: Clear old fragment checksum value in napi_get_frags +net: stmmac: thead: ensure divisor gives proper rate +net: stmmac: thead: use rgmii_clock() for RGMII clock rate page_pool: Convert page_pool_alloc_stats to u64_stats_t. page_pool: Convert page_pool_recycle_stats to u64_stats_t. net: stmmac: qcom-ethqos: use rgmii_clock() to set the link clock @@ -66,98 +70,3 @@ net: phy: move PHY package code from phy_device.c to own source file xfrm_output: Force software GSO only in tunnel mode bonding: report duplicate MAC address in all situations virtio-net: tweak for better TX performance in NAPI mode -Merge branch 'mctp-add-mctp-over-usb-hardware-transport-binding' -net: mctp: Add MCTP USB transport driver -usb: Add base USB MCTP definitions -net: cadence: macb: Implement BQL -net: stmmac: print stmmac_init_dma_engine() errors using netdev_err() -selftests: fib_nexthops: do not mark skipped tests as failed -Merge branch 'net-fib_rules-add-dscp-mask-support' -selftests: fib_rule_tests: Add DSCP mask match tests -netlink: specs: Add FIB rule DSCP mask attribute -net: fib_rules: Enable DSCP mask usage -ipv6: fib_rules: Add DSCP mask matching -ipv4: fib_rules: Add DSCP mask matching -net: fib_rules: Add DSCP mask attribute -Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next -gve: Add RSS cache for non RSS device option scenario -net/rds: Replace deprecated strncpy() with strscpy_pad() -Merge branch 'net-improve-netns-handling-in-rtnetlink' -selftests: net: Add test cases for link and peer netns -selftests: net: Add python context manager for netns entering -rtnetlink: Create link directly in target net namespace -rtnetlink: Remove "net" from newlink params -net: xfrm: Use link netns in newlink() of rtnl_link_ops -net: ipv6: Use link netns in newlink() of rtnl_link_ops -net: ipv6: Init tunnel link-netns before registering dev -net: ip_tunnel: Use link netns in newlink() of rtnl_link_ops -net: ip_tunnel: Don't set tunnel->net in ip_tunnel_init() -ieee802154: 6lowpan: Validate link netns in newlink() of rtnl_link_ops -net: Use link/peer netns in newlink() of rtnl_link_ops -rtnetlink: Pack newlink() params into struct -rtnetlink: Lookup device in target netns when creating link -Merge branch 'dt-bindings-net-realtek-rtl9301-switch' -dt-bindings: net: Add Realtek MDIO controller -dt-bindings: net: Add switch ports and interrupts to RTL9300 -dt-bindings: net: Move realtek,rtl9301-switch to net -net: sfp: add quirk for 2.5G OEM BX SFP -net: phy: remove unused feature array declarations -Merge branch 'selftests-drv-net-improve-the-queue-test-for-xsk' -selftests: drv-net: rename queues check_xdp to check_xsk -selftests: drv-net: improve the use of ksft helpers in XSK queue test -selftests: drv-net: add a way to wait for a local process -selftests: drv-net: probe for AF_XDP sockets more explicitly -selftests: drv-net: add missing new line in xdp_helper -selftests: drv-net: use cfg.rpath() in netlink xsk attr test -selftests: drv-net: add a warning for bkg + shell + terminate -octeontx2: hide unused label -net: phy: qt2025: Fix hardware revision check comment -Merge branch 'mlx5-misc-enhancements-2025-02-19' -net/mlx5e: Separate extended link modes request from link modes type selection -net/mlx5e: Change eth_proto parameter naming -net/mlx5e: Introduce ptys2ethtool_process_link() -net/mlx5e: Refactor ptys2ethtool_adver_link() -net/mlx5: Bridge, correct config option description -neighbour: Replace kvzalloc() with kzalloc() when GFP_ATOMIC is specified -Merge branch 'some-pktgen-fixes-improvments-part-i' -net: pktgen: fix access outside of user given buffer in pktgen_thread_write() -net: pktgen: fix ctrl interface command parsing -net: pktgen: fix 'ratep 0' error handling (return -EINVAL) -net: pktgen: fix 'rate 0' error handling (return -EINVAL) -net: pktgen: fix hex32_arg parsing for short reads -net: pktgen: enable 'param=value' parsing -net: pktgen: replace ENOTSUPP with EOPNOTSUPP -af_unix: Fix undefined 'other' error -Merge branch 'xsk-tx-metadata-launch-time-support' -igc: Add launch time support to XDP ZC -igc: Refactor empty frame insertion for launch time support -net: stmmac: Add launch time support to XDP ZC -selftests/bpf: Add launch time request to xdp_hw_metadata -xsk: Add launch time hardware offload support to XDP Tx metadata -eth: fbnic: Add ethtool support for IRQ coalescing -Merge branch 'support-ptp-clock-for-wangxun-nics' -net: ngbe: Add support for 1PPS and TOD -net: wangxun: Add periodic checks for overflow and errors -net: wangxun: Support to get ts info -net: wangxun: Add support for PTP clock -Merge branch 'net-timestamp-bpf-extension-to-equip-applications-transparently' -selftests/bpf: Add simple bpf tests in the tx path for timestamping feature -bpf: Support selective sampling for bpf timestamping -bpf: Add BPF_SOCK_OPS_TSTAMP_SENDMSG_CB callback -bpf: Add BPF_SOCK_OPS_TSTAMP_ACK_CB callback -bpf: Add BPF_SOCK_OPS_TSTAMP_SND_HW_CB callback -bpf: Add BPF_SOCK_OPS_TSTAMP_SND_SW_CB callback -bpf: Add BPF_SOCK_OPS_TSTAMP_SCHED_CB callback -net-timestamp: Prepare for isolating two modes of SO_TIMESTAMPING -bpf: Disable unsafe helpers in TX timestamping callbacks -bpf: Prevent unsafe access to the sock fields in the BPF timestamping callback -bpf: Prepare the sock_ops ctx and call bpf prog for TX timestamping -bpf: Add networking timestamping support to bpf_get/setsockopt() -tun: Pad virtio headers -netdevsim: call napi_schedule from a timer context -Merge branch 'flexible-array-for-ip-tunnel-options' -net: Add options as a flexible array to struct ip_tunnel_info -ip_tunnel: Use ip_tunnel_info() helper instead of 'info + 1' -Merge branch 'bpf-support-setting-max-rto-for-bpf_setsockopt' -selftests/bpf: Add rto max for bpf_setsockopt test -bpf: Support TCP_RTO_MAX_MS for bpf_setsockopt