Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-06-25--21-00 (v6.16-rc2-1074-g21dd77f36f70) remotes/brancher/net-next-2025-06-26--00-00 (v6.16-rc2-1072-g9b84148f6920) ==== BASE DIFF ==== Documentation/netlink/genetlink-legacy.yaml | 15 ++-- Documentation/netlink/genetlink.yaml | 17 ++-- Documentation/netlink/netlink-raw.yaml | 18 ++-- Documentation/netlink/specs/devlink.yaml | 8 +- Documentation/netlink/specs/dpll.yaml | 2 +- Documentation/netlink/specs/ethtool.yaml | 19 ++++- Documentation/netlink/specs/fou.yaml | 36 ++++---- Documentation/netlink/specs/mptcp_pm.yaml | 8 +- Documentation/netlink/specs/nfsd.yaml | 4 +- Documentation/netlink/specs/ovs_flow.yaml | 6 +- Documentation/netlink/specs/rt-link.yaml | 4 +- Documentation/netlink/specs/tc.yaml | 4 +- Documentation/networking/ethtool-netlink.rst | 3 +- drivers/atm/idt77252.c | 5 ++ drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 +- drivers/net/team/team_core.c | 96 ++++++++++------------ drivers/net/team/team_mode_activebackup.c | 3 +- drivers/net/team/team_mode_loadbalance.c | 13 ++- include/linux/if_team.h | 3 - include/linux/netdevice.h | 5 +- include/linux/packing.h | 6 +- include/net/tc_act/tc_csum.h | 9 -- include/net/tc_act/tc_ct.h | 9 -- include/net/tc_act/tc_gate.h | 9 -- include/net/tc_act/tc_mpls.h | 9 -- include/net/tc_act/tc_police.h | 9 -- include/net/tc_act/tc_sample.h | 9 -- include/net/tc_act/tc_vlan.h | 9 -- include/uapi/linux/ethtool_netlink.h | 2 - include/uapi/linux/ethtool_netlink_generated.h | 3 + include/uapi/linux/mptcp_pm.h | 6 +- include/uapi/linux/net_dropmon.h | 7 -- net/atm/resources.c | 3 +- net/core/neighbour.c | 4 +- net/ethtool/common.h | 8 ++ net/ethtool/ioctl.c | 28 ++++--- net/ethtool/netlink.c | 47 +++++++---- net/ethtool/netlink.h | 4 + net/ethtool/rss.c | 11 +++ tools/testing/selftests/drivers/net/hw/rss_api.py | 89 ++++++++++++++++++++ .../selftests/drivers/net/hw/rss_input_xfrm.py | 2 +- 41 files changed, 317 insertions(+), 237 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.otL5neLeXg b/tmp/tmp.n7JSYptgNb index 875676f2c39d..8d1db4ad470f 100644 --- a/tmp/tmp.otL5neLeXg +++ b/tmp/tmp.n7JSYptgNb @@ -10,25 +10,24 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +Merge tag 'bpf-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf virtio-net: allow more allocated space for mergeable XDP virtio-net: create a helper to check received mergeable buffer's length virtio-net: remove redundant truesize check with PAGE_SIZE virtio-net: ensure the received length does not exceed allocated size +bonding: don't force LACPDU tx to ~333 ms boundaries tcp: fix tcp_ofo_queue() to avoid including too much DUP SACK range octeontx2-af: Fix error code in rvu_mbox_init() net: airoha: Get rid of dma_sync_single_for_device() in airoha_qdma_fill_rx_queue() Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux net: fec: allow disable coalescing ethernet: atl1: Add missing DMA mapping error checks and count errors -ptp: add Alibaba CIPU PTP clock driver vhost/vsock: Allocate nonlinear SKBs for handling large transmit buffers vsock/virtio: Rename virtio_vsock_skb_rx_put() to virtio_vsock_skb_put() vhost/vsock: Allocate nonlinear SKBs for handling large receive buffers vsock/virtio: Resize receive buffers so that each SKB fits in a page vhost/vsock: Avoid allocating arbitrarily-sized SKBs -Bluetooth: HCI: Fix HCI command order for extended advertising tg3: spelling corrections -net: xsk: introduce XDP_MAX_TX_BUDGET setsockopt Cast to the proper type Use unqualified references to ffi types ptp: Simplify ptp_read() @@ -45,10 +44,6 @@ ptp: Split out PTP_PEROUT_REQUEST ioctl code ptp: Split out PTP_EXTTS_REQUEST ioctl code ptp: Split out PTP_CLOCK_GETCAPS ioctl code net: mana: Fix build errors when CONFIG_NET_SHAPER is disabled -selftests: net: add netpoll basic functionality test -selftests: drv-net: Strip '@' prefix from bpftrace map keys -selftests: drv-net: Improve bpftrace utility error handling -selftests: drv-net: add helper/wrapper for bpftrace octeontx2-pf: Check for DMAC extraction before setting VF DMAC net: ethernet: ti: am65-cpsw-nuss: Fix skb size by accounting for skb_shared_info selftests: forwarding: lib: Split setup_wait() @@ -73,8 +68,6 @@ rose: fix dangling neighbour pointers in rose_rt_device_down() Octeontx2-pf: ethtool: support multi advertise mode Octeontx2-af: Introduce mode group index Octeontx-pf: Update SGMII mode mapping -net: ipv4: fix stat increase when udp early demux drops the packet -Bluetooth: hci_event: Add support for handling LE BIG Sync Lost event net: mctp: test: Add tests for gateway routes net: mctp: add gateway routing support net: mctp: allow NL parsing directly into a struct mctp_route @@ -91,8 +84,6 @@ net: mctp: test: make cloned_frag buffers more appropriately-sized net: mctp: don't use source cb data when forwarding, ensure pkt_type is set ARM: dts: Fix up wrv54g device tree dt-bindings: dsa: Rewrite Micrel KS8995 in schema -net: thunderbolt: Use correct request type in login/logout request packets -bnxt_en: Add parameter disable_vf_bind netmem: introduce a netmem API, virt_to_head_netmem() page_pool: make page_pool_get_dma_addr() just wrap page_pool_get_dma_addr_netmem() netmem: use _Generic to cover const casting for page_to_netmem() @@ -100,20 +91,9 @@ page_pool: rename __page_pool_alloc_pages_slow() to __page_pool_alloc_netmems_sl page_pool: rename __page_pool_release_page_dma() to __page_pool_release_netmem_dma() page_pool: rename page_pool_return_page() to page_pool_return_netmem() netmem: introduce struct netmem_desc mirroring struct page -hinic3: Interrupt request configuration -hinic3: Mailbox management interfaces -hinic3: Mailbox framework -hinic3: TX & RX Queue coalesce interfaces -hinic3: Command Queue interfaces -hinic3: Command Queue framework -hinic3: Complete Event Queue interfaces -hinic3: Async Event Queue interfaces -net: stmmac: Fix interrupt handling for level-triggered mode in DWC_XGMAC2 net: libwx: fix the creation of page_pool net: thunderbolt: Fix the parameter passing of tb_xdomain_enable_paths()/tb_xdomain_disable_paths() ipv4: fib: Remove unnecessary encap_type check -i40e: When removing VF MAC filters, only check PF-set MAC -atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister(). ipv6: Remove setsockopt_needs_rtnl(). ipv6: anycast: Don't hold RTNL for IPV6_JOIN_ANYCAST. ipv6: anycast: Unify two error paths in ipv6_sock_ac_join(). @@ -131,8 +111,6 @@ ipv6: mcast: Replace locking comments with lockdep annotations. ipv6: ndisc: Remove __in6_dev_get() in pndisc_{constructor,destructor}(). dt-bindings: net: convert lpc-eth.txt yaml format net: selftests: fix TCP packet checksum -xfrm: Duplicate SPI Handling -net: enetc: Correct endianness handling in _enetc_rd_reg64 docs: net: sysctl documentation cleanup eth: fbnic: rename fbnic_fw_clear_cmpl to fbnic_mbx_clear_cmpl eth: fbnic: sort includes @@ -161,26 +139,10 @@ af_unix: Drop unix_stream_read_state::splice_flags tcp: Drop tcp_splice_state::flags net: splice: Drop unused @flags net: splice: Drop unused @pipe -net: txgbe: fix the issue of TX failture -net: ngbe: specify IRQ vector when the number of VFs is 7 -net: wangxun: revert the adjustment of the IRQ vector sequence -net: txgbe: request MISC IRQ in ndo_open -atm: idt77252: Add missing `dma_map_error()` net: bonding: send peer notify when failure recovery net: bonding: add broadcast_neighbor netlink option net: bonding: add broadcast_neighbor option for 802.3ad -net/sched: Remove unused functions -neighbour: Remove redundant assignment to err -selftests: drv-net: test RSS Netlink notifications -doc: ethtool: mark ETHTOOL_GRXFHINDIR as reimplemented -net: ethtool: rss: add notifications -net: ethtool: copy req_info from SET to NTF -net: ethtool: remove the data argument from ethtool_notify() -net: ethtool: call .parse_request for SET handlers -net: ethtool: dynamically allocate full req size req -netlink: specs: add the multicast group name to spec rds: Expose feature parameters via sysfs (and ELF) -team: replace team lock with rtnl lock MAINTAINERS: update smc section skbuff: Improve the sending efficiency of __skb_send_sock Documentation: netlink: specs: tc: Add DualPI2 specification @@ -191,6 +153,14 @@ sched: Dump configuration and statistics of dualpi2 qdisc sched: Struct definition and parsing of dualpi2 qdisc net: mdio: Add MDIO bus controller for Airoha AN7583 dt-bindings: net: Document support for Airoha AN7583 MDIO Controller +selftests/bpf: adapt one more case in test_lru_map to the new target_free +libbpf: Fix possible use-after-free for externs net/mlx5: Add IFC bits for PCIe Congestion Event object net/mlx5: Small refactor for general object capabilities net/mlx5: fs, add multiple prios to RDMA TRANSPORT steering domain +Merge branch 'bpf-specify-access-type-of-bpf_sysctl_get_name-args' +selftests/bpf: Convert test_sysctl to prog_tests +bpf: Specify access type of bpf_sysctl_get_name args +libbpf: Fix null pointer dereference in btf_dump__free on allocation failure +bpf: Adjust free target to avoid global starvation of LRU map +bpf: Mark dentry->d_inode as trusted_or_null