Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-05-05--16-00 (v6.15-rc4-839-gce7157923af8) remotes/brancher/net-next-hw-2025-05-06--00-00 (v6.15-rc4-850-g9f52a40a102a) ==== BASE DIFF ==== .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 1 + .../bindings/net/ethernet-controller.yaml | 97 ++++- .../devicetree/bindings/net/via,vt8500-rhine.yaml | 41 ++ .../devicetree/bindings/net/via-rhine.txt | 17 - Documentation/networking/devlink/ixgbe.rst | 49 +++ drivers/net/ethernet/freescale/enetc/Kconfig | 3 +- drivers/net/ethernet/intel/idpf/idpf_lib.c | 18 +- .../net/ethernet/intel/idpf/idpf_singleq_txrx.c | 25 +- drivers/net/ethernet/intel/igb/igb.h | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 78 +++- drivers/net/ethernet/intel/igb/igb_xsk.c | 1 + drivers/net/ethernet/intel/igc/igc.h | 5 +- drivers/net/ethernet/intel/igc/igc_main.c | 18 +- drivers/net/ethernet/intel/igc/igc_tsn.c | 39 +- drivers/net/ethernet/intel/ixgbe/Makefile | 3 +- drivers/net/ethernet/intel/ixgbe/devlink/devlink.h | 2 + drivers/net/ethernet/intel/ixgbe/devlink/region.c | 290 ++++++++++++ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 3 + drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c | 29 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 171 +++++++- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 13 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h | 14 + drivers/net/ethernet/mediatek/mtk_eth_path.c | 43 ++ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 119 ++++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 57 ++- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 33 +- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h | 1 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 56 +-- drivers/net/mdio/Kconfig | 16 +- drivers/net/phy/Makefile | 2 +- drivers/net/phy/mdio_bus.c | 462 +------------------- drivers/net/phy/mdio_bus_provider.c | 484 +++++++++++++++++++++ drivers/net/phy/phy_device.c | 8 +- drivers/net/phy/realtek/realtek_main.c | 69 +++ drivers/net/usb/Kconfig | 4 +- drivers/net/usb/r8152.c | 46 +- drivers/net/virtio_net.c | 19 +- include/linux/phy.h | 1 + include/linux/stmmac.h | 3 +- include/linux/udp.h | 3 + include/net/sctp/sm.h | 1 - include/net/sctp/structs.h | 2 - include/net/strparser.h | 2 - net/ipv4/fib_semantics.c | 11 +- net/ipv4/udp.c | 173 +++++--- net/ipv6/route.c | 97 +++-- net/ipv6/seg6_local.c | 6 +- net/mptcp/protocol.c | 4 +- net/sched/bpf_qdisc.c | 24 +- net/sched/sch_api.c | 4 +- net/sched/sch_generic.c | 4 +- net/sched/sch_htb.c | 15 +- net/sctp/associola.c | 18 - net/sctp/sm_make_chunk.c | 8 - net/strparser/strparser.c | 13 - tools/net/ynl/lib/ynl-priv.h | 2 +- tools/net/ynl/lib/ynl.c | 12 +- tools/net/ynl/lib/ynl.h | 14 + tools/net/ynl/pyynl/ynl_gen_c.py | 216 +++++++-- tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c | 119 +++-- .../selftests/bpf/prog_tests/sock_iter_batch.c | 447 ++++++++++++++++++- .../testing/selftests/bpf/progs/bpf_qdisc_common.h | 6 +- .../bpf/progs/bpf_qdisc_fail__incompl_ops.c | 41 ++ tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c | 9 + tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c | 6 + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 1 + .../testing/selftests/bpf/progs/sock_iter_batch.c | 24 +- tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 4 +- .../selftests/drivers/net/hw/rss_input_xfrm.py | 5 + tools/testing/selftests/net/mptcp/diag.sh | 32 ++ tools/testing/selftests/net/mptcp/mptcp_diag.c | 228 ++++++++-- tools/testing/selftests/net/mptcp/mptcp_inq.c | 16 +- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 7 +- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 16 +- .../tc-testing/tc-tests/infra/qdiscs.json | 35 ++ 76 files changed, 2950 insertions(+), 1021 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.Lnu9Y0ofba b/tmp/tmp.dTvhTUFTDF index d6e1af13acb4..87ae3d5fc2f4 100644 --- a/tmp/tmp.Lnu9Y0ofba +++ b/tmp/tmp.dTvhTUFTDF @@ -4,6 +4,23 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +tools: ynl-gen: move the count into a presence struct too +tools: ynl-gen: split presence metadata +tools: ynl-gen: rename basic presence from 'bit' to 'present' +net: ethernet: ti: am65-cpsw: remove cpsw_ale_classifier_setup_default() +net: ethernet: ti: am65-cpsw: add network flow classification support +net: ethernet: ti: cpsw_ale: add policer save restore for PM sleep +net: ethernet: ti: cpsw_ale: add cpsw_ale_policer_set/clr_entry() +net: ethernet: ti: cpsw_ale: add cpsw_ale_policer_reset_entry() +net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_add_ucast() +net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_vlan_add_modify() +net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_add_vlan() +net: ethernet: ti: cpsw_ale: Update Policer fields for more ALE size/ports +ice: use DSN instead of PCI BDF for ice_adapter index +devlink: use DEVLINK_VAR_ATTR_TYPE_* instead of NLA_* in fmsg +devlink: avoid param type value translations +devlink: define enum for attr types of dynamic attributes +tools: ynl-gen: allow noncontiguous enums tools: ynl-gen: validate 0 len strings from kernel io_uring/zcrx: selftests: fix setting ntuple rule into rss eth: fbnic: fix `tx_dropped` counting @@ -11,10 +28,8 @@ selftests: drv: net: add version indicator selftests: drv: net: avoid skipping tests selftests: drv: net: fix test failure on ipv6 sys selftests: net: exit cleanly on SIGTERM / timeout -Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next selftests: Add IPv6 link-local address generation tests for GRE devices. gre: Fix again IPv6 link-local address generation. -selftests: iou-zcrx: Clean up build warnings for error format net: ti: icssg-prueth: add TAPRIO offload support net: ethtool: netlink: Use netdev_hold for dumpit() operations net: ethtool: phy: Convert the PHY_GET command to generic phy dump @@ -23,28 +38,6 @@ vsock/test: Expand linger test to ensure close() does not misbehave vsock: Move lingering logic to af_vsock core vsock/virtio: Linger on unsent data xdp: add xdp_skb_reserve_put helper -virtio-net: free xsk_buffs on error in virtnet_xsk_pool_enable() -virtio-net: don't re-enable refill work too early when NAPI is disabled -dt-bindings: net: ethernet-controller: Add informative text about RGMII delays -net: phy: Refactor fwnode_get_phy_node() -rds: Use nested-BH locking for rds_page_remainder -rds: Acquire per-CPU pointer within BH disabled section -rds: Disable only bottom halves in rds_page_remainder_alloc() -mptcp: Use nested-BH locking for hmac_storage -net/sched: Use nested-BH locking for sch_frag_data_storage -net/sched: act_mirred: Move the recursion counter struct netdev_xmit -openvswitch: Move ovs_frag_data_storage into the struct ovs_pcpu_storage -openvswitch: Use nested-BH locking for ovs_pcpu_storage -openvswitch: Merge three per-CPU structures into one -xfrm: Use nested-BH locking for nat_keepalive_sk_ipv[46] -netfilter: nf_dup_netdev: Move the recursion counter struct netdev_xmit -netfilter: nft_inner: Use nested-BH locking for nft_pcpu_tun_ctx -netfilter: nf_dup{4, 6}: Move duplication check to task_struct -xdp: Use nested-BH locking for system_page_pool -ipv6: sr: Use nested-BH locking for hmac_storage -ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT -net: dst_cache: Use nested-BH locking for dst_cache::cache -net: page_pool: Don't recycle into cache on PREEMPT_RT mfd: zl3073x: Register DPLL sub-device during init mfd: zl3073x: Add clock_id field mfd: zl3073x: Fetch invariants during probe @@ -73,66 +66,3 @@ 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 -selftests/tc-testing: Add a test case to cover basic HTB+FQ_CODEL case -sch_htb: make htb_deactivate() idempotent -ipv4: Honor "ignore_routes_with_linkdown" sysctl in nexthop selection -ipv6: Restore fib6_config validation for SIOCADDRT. -mptcp: Align mptcp_inet6_sk with other protocols -Merge branch 'net-stmmac-replace-speed_mode_2500-method' -net: stmmac: remove speed_mode_2500() method -net: stmmac: intel: convert speed_mode_2500() to get_interfaces() -net: stmmac: intel: move phy_interface init to tgl_common_data() -net: stmmac: add get_interfaces() platform method -net: stmmac: use priv->plat->phy_interface directly -net: stmmac: use a local variable for priv->phylink_config -Merge branch 'fix-bpf-qdisc-bugs-and-clean-up' -selftests/bpf: Cleanup bpf qdisc selftests -selftests/bpf: Test attaching a bpf qdisc with incomplete operators -bpf: net_sched: Make some Qdisc_ops ops mandatory -selftests/bpf: Test setting and creating bpf qdisc as default qdisc -bpf: net_sched: Fix bpf qdisc init prologue when set as default qdisc -Merge branch 'bpf-udp-exactly-once-socket-iteration' -selftests/bpf: Add tests for bucket resume logic in UDP socket iterators -selftests/bpf: Return socket cookies from sock_iter_batch progs -bpf: udp: Avoid socket skips and repeats during iteration -bpf: udp: Use bpf_udp_iter_batch_item for bpf_udp_iter_state batch items -bpf: udp: Get rid of st_bucket_done -bpf: udp: Make sure iter->batch always contains a full bucket snapshot -bpf: udp: Make mem flags configurable through bpf_iter_udp_realloc_batch -Merge branch 'tools-ynl-gen-additional-c-types-and-classic-netlink-handling' -tools: ynl: allow fixed-header to be specified per op -tools: ynl-gen: don't init enum checks for classic netlink -tools: ynl-gen: array-nest: support binary array with exact-len -tools: ynl-gen: array-nest: support put for scalar -tools: ynl-gen: mutli-attr: support binary types with struct -tools: ynl-gen: multi-attr: type gen for string -tools: ynl-gen: support CRUD-like notifications for classic Netlink -tools: ynl-gen: support using dump types for ntf -tools: ynl: let classic netlink requests specify extra nlflags -tools: ynl-gen: fill in missing empty attr lists -tools: ynl-gen: factor out free_needs_iter for a struct -tools: ynl-gen: fix comment about nested struct dict -dt-bindings: net: via-rhine: Convert to YAML -ipv6: sr: switch to GFP_ATOMIC flag to allocate memory during seg6local LWT setup -net: phy: factor out provider part from mdio_bus.c -net: ethernet: mtk_eth_soc: add support for MT7988 internal 2.5G PHY -r8152: use SHA-256 library API instead of crypto_shash API -net: phy: realtek: Add support for WOL magic packet on RTL8211F -selftests: drv-net: rss_input_xfrm: Check test prerequisites before running -dt-bindings: net: sun8i-emac: Add A523 EMAC0 compatible -Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue -idpf: remove unreachable code from setting mailbox -idpf: assign extracted ptype to struct libeth_rqe_info field -ixgbe: devlink: add devlink region support for E610 -ixgbe: add E610 .set_phys_id() callback implementation -ixgbe: apply different rules for setting FC on E610 -ixgbe: add support for ACPI WOL for E610 -ixgbe: create E610 specific ethtool_ops structure -igc: Change Tx mode for MQPRIO offloading -igc: Limit netdev_tc calls to MQPRIO -igb: Get rid of spurious interrupts -igb: Add support for persistent NAPI config -igb: Link queues to NAPI instances -igb: Link IRQs to NAPI instances -bpf: net_sched: Fix using bpf qdisc as default qdisc -selftests/bpf: Fix compilation errors