Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-04-28--21-00 (v6.15-rc3-766-g934d520a923d) remotes/brancher/net-next-2025-04-29--00-00 (v6.15-rc3-774-gc4fddce62aae) ==== BASE DIFF ==== Documentation/netlink/specs/ethtool.yaml | 4 +- drivers/bluetooth/btintel_pcie.c | 57 ++++--- drivers/bluetooth/btmtksdio.c | 12 +- drivers/bluetooth/btusb.c | 101 +++++++---- drivers/net/ethernet/amd/pds_core/auxbus.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 9 +- drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 24 ++- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 11 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 4 + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 13 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- drivers/net/ethernet/freescale/enetc/Kconfig | 3 +- drivers/net/ethernet/intel/ice/ice_ddp.c | 10 +- drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 5 + drivers/net/ethernet/intel/idpf/idpf.h | 18 +- drivers/net/ethernet/intel/idpf/idpf_lib.c | 57 +++---- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 14 +- .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 14 +- drivers/net/ethernet/marvell/octeontx2/nic/rep.c | 12 +- .../net/ethernet/marvell/prestera/prestera_pci.c | 6 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 - drivers/net/ethernet/natsemi/natsemi.c | 2 +- drivers/net/ethernet/sis/sis900.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 70 ++++---- drivers/net/mdio/Kconfig | 7 +- drivers/net/mdio/mdio-thunder.c | 10 +- drivers/net/veth.c | 57 +++++-- drivers/net/vrf.c | 4 +- include/net/bluetooth/hci.h | 4 +- include/net/bluetooth/hci_core.h | 20 +-- include/net/bluetooth/hci_sync.h | 3 + include/net/sch_generic.h | 8 + include/uapi/linux/ethtool_netlink_generated.h | 5 - net/bluetooth/hci_conn.c | 181 +------------------- net/bluetooth/hci_event.c | 15 +- net/bluetooth/hci_sync.c | 150 ++++++++++++++++- net/bluetooth/iso.c | 26 ++- net/bluetooth/l2cap_core.c | 3 + net/sched/sch_drr.c | 9 +- net/sched/sch_ets.c | 9 +- net/sched/sch_hfsc.c | 2 +- net/sched/sch_qfq.c | 11 +- tools/testing/selftests/drivers/net/.gitignore | 1 - tools/testing/selftests/drivers/net/Makefile | 1 - tools/testing/selftests/drivers/net/hw/Makefile | 1 + .../selftests/drivers/net/hw/xsk_reconfig.py | 60 +++++++ .../testing/selftests/drivers/net/napi_id_helper.c | 2 +- tools/testing/selftests/drivers/net/queues.py | 4 +- tools/testing/selftests/net/lib/.gitignore | 1 + tools/testing/selftests/net/lib/Makefile | 1 + .../selftests/{drivers/net => net/lib}/ksft.h | 0 .../{drivers/net => net/lib}/xdp_helper.c | 39 ++++- .../tc-testing/tc-tests/infra/qdiscs.json | 186 +++++++++++++++++++++ 54 files changed, 816 insertions(+), 461 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.fWKg4FfzpQ b/tmp/tmp.05CA0YhAzx index 3edef4e8d038..bd09160f0943 100644 --- a/tmp/tmp.fWKg4FfzpQ +++ b/tmp/tmp.05CA0YhAzx @@ -64,14 +64,6 @@ net/mlx4_core: Adjust allocation type for buddy->bits pds_core: Allocate pdsc_viftype_defaults copy with ARRAY_SIZE() ipv4: fib: Fix fib_info_hash_alloc() allocation type net: dlink: add synchronization for stats update -idpf: fix offloads support for encapsulated packets -ice: Check VF VSI Pointer Value in ice_vc_add_fdir_fltr() -ice: fix Get Tx Topology AQ command error on E830 -selftests: tc-testing: Add TDC tests that exercise reentrant enqueue behaviour -net_sched: qfq: Fix double list add in class with netem as child qdisc -net_sched: ets: Fix double list add in class with netem as child qdisc -net_sched: hfsc: Fix a UAF vulnerability in class with netem as child qdisc -net_sched: drr: Fix double list add in class with netem as child qdisc idpf: add support for Rx timestamping idpf: add Tx timestamp flows idpf: add Tx timestamp capabilities negotiation @@ -95,10 +87,7 @@ netmem: add niov->type attribute to distinguish different net_iov types pds_core: init viftype default in declaration pds_core: smaller adminq poll starting interval pds_core: remove extra name description -pds_core: remove write-after-free of client_id -Merge tag 'for-net-2025-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth net: mdio: mux-meson-gxl: set reversed bit when using internal phy -netlink: specs: ethtool: Remove UAPI duplication of phy-upstream enum mfd: zl3073x: Register DPLL sub-device during init mfd: zl3073x: Add clock_id field mfd: zl3073x: Fetch invariants during probe @@ -109,30 +98,13 @@ dt-bindings: dpll: Add support for Microchip Azurite chip family dt-bindings: dpll: Add DPLL device and pin net: dlink: Correct endianness handling of led_mode selftests: net: exit cleanly on SIGTERM / timeout -veth: apply qdisc backpressure on full ptr_ring to reduce TX drops -net: sched: generalize check for no-queue qdisc on TX queue leds: trigger: netdev: refactor dev matching in netdev_trig_notify() -mdio: fix CONFIG_MDIO_DEVRES selects -net: thunder_bgx: Don't disable PCI device manually -net: thunder_bgx: Use pure PCI devres API -net: mdio: thunder: Use pure PCI devres API -net: ethernet: sis900: Use pure PCI devres API -net: ethernet: natsemi: Use pure PCI devres API -net: tulip: Use pure PCI devres API -net: octeontx2: Use pure PCI devres API -net: prestera: Use pure PCI devres API net: call inet_twsk_put() on TIMEWAIT sockets It is possible for a pointer of type struct inet_timewait_sock to be returned from the functions __inet_lookup_established() and __inet6_lookup_established(). This can cause a crash when the returned pointer is of type struct inet_timewait_sock and sock_put() is called on it. The following is a crash call stack that shows sk->sk_wmem_alloc being accessed in sk_free() during the call to sock_put() on a struct inet_timewait_sock pointer. To avoid this issue, use inet_twsk_put() instead of sock_put() when sk->sk_state is TCP_TIME_WAIT. -selftests: net: add a virtio_net deadlock selftest -selftests: net: retry when bind returns EBUSY in xdp_helper -selftests: net: add flag to force zerocopy mode in xdp_helper -selftests: net: move xdp_helper to net/lib rtase: Modify the format specifier in snprintf to %u net: lan743x: Fix memory leak when GSO enabled -net: ethernet: mtk_eth_soc: sync mtk_clks_source_name array selftests/net: test tcp connection load balancing ip: load balance tcp connections to single dst addr and port ipv4: prefer multipath nexthop that matches source address -amd-xgbe: Fix to ensure dependent features are toggled with RX checksum offload net: ti: icssg-prueth: Add ICSSG FW Stats dt-bindings: net: pse-pd: ti,tps23881: Add interrupt description net: pse-pd: tps23881: Add support for static port priority feature @@ -147,11 +119,3 @@ net: pse-pd: Add support for PSE power domains net: pse-pd: tps23881: Add support for PSE events and interrupts net: pse-pd: Add support for reporting events net: ethtool: Add support for ethnl_info_init_ntf helper function -Bluetooth: L2CAP: copy RX timestamp to new fragments -Bluetooth: btintel_pcie: Add additional to checks to clear TX/RX paths -Bluetooth: btmtksdio: Do close if SDIO card removed without close -Bluetooth: btmtksdio: Check function enabled before doing close -Bluetooth: btusb: avoid NULL pointer dereference in skb_dequeue() -Bluetooth: btintel_pcie: Avoid redundant buffer allocation -Bluetooth: hci_conn: Fix not setting timeout for BIG Create Sync -Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver