Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-04-22--00-00 (v6.15-rc2-790-g29ef21e0c27e) remotes/brancher/net-next-2025-04-22--03-00 (v6.15-rc2-788-gdc9160fb6f70) ==== BASE DIFF ==== MAINTAINERS | 3 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +- drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c | 11 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 5 - drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 4 - drivers/net/ethernet/freescale/enetc/enetc.c | 45 +- .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 26 +- drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 6 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 86 +-- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/xen-netfront.c | 17 +- drivers/s390/net/ism_drv.c | 2 +- include/linux/btf.h | 1 + kernel/bpf/btf.c | 6 +- net/core/neighbour.c | 4 +- net/core/netdev-genl.c | 9 +- net/core/rtnetlink.c | 25 +- net/sched/Kconfig | 12 + net/sched/Makefile | 1 + net/sched/bpf_qdisc.c | 461 +++++++++++++ net/sched/sch_api.c | 7 +- net/sched/sch_generic.c | 3 +- tools/lib/bpf/libbpf.h | 5 +- tools/lib/bpf/netlink.c | 20 +- tools/testing/selftests/bpf/config | 2 + tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c | 180 +++++ .../testing/selftests/bpf/progs/bpf_qdisc_common.h | 31 + tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c | 117 ++++ tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c | 750 +++++++++++++++++++++ tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 50 ++ tools/testing/selftests/bpf/xsk_xdp_common.h | 1 + tools/testing/selftests/bpf/xskxceiver.c | 118 +++- tools/testing/selftests/bpf/xskxceiver.h | 2 + 34 files changed, 1870 insertions(+), 155 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.0ikEWH5DJn b/tmp/tmp.acnJ2mzAwZ index 10724335cae1..ce0495a2afbe 100644 --- a/tmp/tmp.0ikEWH5DJn +++ b/tmp/tmp.acnJ2mzAwZ @@ -6,6 +6,7 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +xdp: create locked/unlocked instances of xdp redirect target setters vsock/test: Expand linger test to ensure close() does not misbehave vsock: Reduce indentation in virtio_transport_wait_close() vsock: Linger on unsent data @@ -22,6 +23,8 @@ net: stmmac: Refactor VLAN implementation amd-xgbe: Fix to ensure dependent features are toggled with RX checksum offload r8169: use pci_prepare_to_sleep in rtl_shutdown hinic3: module initialization and tx/rx logic +net: wangxun: restrict feature flags for tunnel packets +net: txgbe: Support to set UDP tunnel port octeontx2-af: Remove unused rvu_npc_enable_bcast_entry octeontx2-pf: AF_XDP: code clean up vhost/net: Defer TX queue re-enable until after sendmsg @@ -40,9 +43,6 @@ net: ethtool: mm: reset verification status when link is down net: ethtool: mm: extract stmmac verification logic into common library net: stmmac: move frag_size handling out of spin_lock net: phy: marvell-88q2xxx: Enable temperature sensor for mv88q211x -cmtp: enforce CAP_NET_RAW for raw sockets in cmtp_sock_create() -net/mlx5: Fix spelling mistakes in mlx5_core_dbg message and comments -net: axienet: Fix spelling mistake "archecture" -> "architecture" net: airoha: Enable multiple IRQ lines support in airoha_eth driver. net: airoha: Introduce airoha_irq_bank struct r8169: merge chip versions 52 and 53 (RTL8117) @@ -51,8 +51,6 @@ r8169: merge chip versions 70 and 71 (RTL8126A) net: phy: remove function stubs net: fully namespace net.core.{r,w}mem_{default,max} sysctls selftests/vsock: add initial vmtest.sh for vsock -net/mlx5: Move ttc allocation after switch case to prevent leaks -net/mlx5: Fix null-ptr-deref in mlx5_create_{inner_,}ttc_table() netlink: specs: rt-rule: add C naming info netlink: specs: rtnetlink: correct notify properties netlink: specs: rt-neigh: make sure getneigh is consistent @@ -65,7 +63,6 @@ netlink: specs: rt-link: remove duplicated group in attr list netlink: specs: rt-link: remove if-netnsid from attr list netlink: specs: rt-link: remove the fixed members from attrs netlink: specs: allow header properties for attribute sets -net: fix the missing unlock for detached devices neighbour: Convert RTM_SETNEIGHTBL to RCU. neighbour: Convert RTM_GETNEIGHTBL to RCU. neighbour: Convert RTM_GETNEIGH to RCU. @@ -92,26 +89,7 @@ ipv6: Check GATEWAY in rtm_to_fib6_multipath_config(). ipv6: Move some validation from ip6_route_info_create() to rtm_to_fib6_config(). ipv6: Get rid of RTNL for SIOCDELRT and RTM_DELROUTE. ipv6: Validate RTA_GATEWAY of RTA_MULTIPATH in rtm_to_fib6_config(). -selftests: ncdevmem: Implement devmem TCP TX -net: check for driver support in netmem TX -gve: add netmem TX support to GVE DQO-RDA mode -net: enable driver support for netmem TX -net: add devmem TCP TX documentation -net: devmem: Implement TX path -net: devmem: TCP tx netlink api -net: add get_netmem/put_netmem support -netmem: add niov->type attribute to distinguish different net_iov types gve: Add adminq lock for creating and destroying multiple queues -sunrpc: allow SOMAXCONN backlogged TCP connections -bnxt_en: Remove unused macros in bnxt_ulp.h -bnxt_en: Remove unused field "ref_count" in struct bnxt_ulp -bnxt_en: Report the ethtool coredump length after copying the coredump -bnxt_en: Change FW message timeout warning -net: stmmac: socfpga: convert to devm_stmmac_pltfr_probe() -net: stmmac: socfpga: call set_phy_mode() before registration -net: stmmac: socfpga: convert to stmmac_pltfr_pm_ops -net: stmmac: socfpga: provide init function -net: stmmac: socfpga: init dwmac->stmmac_rst before registration net: stmmac: visconti: convert to set_clk_tx_rate() method net: ethernet: mtk_eth_soc: convert cap_bit in mtk_eth_muxc struct to u64 net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration @@ -121,21 +99,6 @@ net: sched: generalize check for no-queue qdisc on TX queue selftests: net/bridge : add tests for per vlan snooping with stp state changes net: bridge: mcast: update multicast contex when vlan state is changed net: bridge: mcast: re-implement br_multicast_{enable, disable}_port functions -net/mlx5: Don't use %pK through tracepoints -ice: Don't use %pK through printk or tracepoints -net: Use nlmsg_payload in rtnetlink file -net: Use nlmsg_payload in neighbour file -xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() -net: enetc: fix frame corruption on bpf_xdp_adjust_head/tail() and XDP_PASS -net: enetc: refactor bulk flipping of RX buffers to separate function -net: enetc: register XDP RX queues with frag_size -s390: ism: Pass string literal as format argument of dev_set_name() -MAINTAINERS: Add s390 networking drivers to NETWORKING DRIVERS -MAINTAINERS: Add ism.h to S390 NETWORKING DRIVERS -net/mlx5: Expose function UID in devlink info -devlink: add function unique identifier to devlink dev info -net/mlx5: Expose serial numbers in devlink info -net: ipv4: Fix uninitialized pointer warning in fnhe_remove_oldest net: airoha: Add missing filed to ppe_mbox_data struct MAINTAINERS: Add entry for Renesas RZ/V2H(P) DWMAC GBETH glue layer driver net: stmmac: Add DWMAC glue layer for Renesas GBETH @@ -143,8 +106,6 @@ dt-bindings: net: Document support for Renesas RZ/V2H(P) GBETH dt-bindings: net: dwmac: Increase 'maxItems' for 'interrupts' and 'interrupt-names' tipc: fix NULL pointer dereference in tipc_mon_reinit_self() ptp: Do not enable by default during compile testing -net: wangxun: restrict feature flags for tunnel packets -net: txgbe: Support to set UDP tunnel port selftests: net: add a virtio_net deadlock selftest selftests: net: add flag to force zerocopy mode in xdp_helper selftests: net: move xdp_helper to net/lib @@ -186,13 +147,6 @@ TCP: note received valid-cookie Fast Open option ionic: add module eeprom channel data to ionic_if and ethtool ionic: support ethtool get_module_eeprom_by_page ionic: extend the QSFP module sprom for more pages -net: phy: remove checks for unused eee-broken flags -dt-bindings: net: ethernet-phy: remove eee-broken flags which have never had a user -sched: Add enqueue/dequeue of dualpi2 qdisc -sched: Dump configuration and statistics of dualpi2 qdisc -sched: Struct definition and parsing of dualpi2 qdisc -selftests/tc-testing: Add selftests for qdisc DualPI2 -Documentation: netlink: specs: tc: Add DualPI2 specification vxlan: Convert FDB table to rhashtable vxlan: Introduce FDB key structure vxlan: Do not treat dst cache initialization errors as fatal