Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-11-19--00-00 (v6.18-rc5-1300-gc1f45bc3f562) remotes/brancher/net-next-2025-11-19--03-00 (v6.18-rc5-1254-gc6acee2e5a6a) ==== BASE DIFF ==== .../devicetree/bindings/net/cdns,macb.yaml | 5 +- Documentation/netlink/genetlink-c.yaml | 2 +- Documentation/netlink/genetlink.yaml | 2 +- Documentation/netlink/netlink-raw.yaml | 2 +- Documentation/netlink/specs/rt-addr.yaml | 6 +- Documentation/netlink/specs/rt-link.yaml | 16 ++-- Documentation/netlink/specs/rt-neigh.yaml | 2 +- Documentation/netlink/specs/rt-route.yaml | 8 +- Documentation/netlink/specs/rt-rule.yaml | 6 +- Documentation/networking/index.rst | 5 +- Documentation/networking/xfrm/index.rst | 13 +++ .../networking/{ => xfrm}/xfrm_device.rst | 20 +++-- Documentation/networking/{ => xfrm}/xfrm_proc.rst | 0 Documentation/networking/{ => xfrm}/xfrm_sync.rst | 97 +++++++++++----------- .../networking/{ => xfrm}/xfrm_sysctl.rst | 4 +- MAINTAINERS | 1 + drivers/net/dsa/ks8995.c | 6 +- include/net/xfrm.h | 3 +- net/core/skbuff.c | 48 +++++++---- net/devlink/rate.c | 4 +- net/ipv4/esp4_offload.c | 6 +- net/ipv4/tcp_minisocks.c | 1 - net/ipv6/esp6_offload.c | 6 +- net/kcm/Kconfig | 4 +- net/key/af_key.c | 2 + net/xfrm/Kconfig | 11 ++- net/xfrm/xfrm_device.c | 2 +- net/xfrm/xfrm_input.c | 30 +++---- net/xfrm/xfrm_output.c | 8 +- net/xfrm/xfrm_state.c | 30 +++++-- net/xfrm/xfrm_user.c | 8 +- tools/net/ynl/pyynl/lib/ynl.py | 9 ++ tools/net/ynl/ynltool/.gitignore | 1 + 33 files changed, 225 insertions(+), 143 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.rZkJZdEIF5 b/tmp/tmp.gtNyPm8L2W index ace4d6a4c8d8..091f81a59c6d 100644 --- a/tmp/tmp.rZkJZdEIF5 +++ b/tmp/tmp.gtNyPm8L2W @@ -12,6 +12,8 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests nipa: fbnic: link up on QEMU +ice: fix PTP cleanup on driver removal in error path +idpf: fix possible vport_config NULL pointer deref in remove selftests: net: remove old setup_* scripts netdevsim: add loopback support selftests: drv-net: hw: convert the Toeplitz test to Python @@ -24,38 +26,11 @@ selftests: drv-net: xdp: use variants for qstat tests selftests: net: py: add test variants selftests: net: py: extract the case generation logic selftests: net: py: coding style improvements -net: dsa: sja1105: permit finding the XPCS via pcs-handle -net: dsa: sja1105: replace mdiobus-pcs with xpcs-plat driver -net: pcs: xpcs-plat: add NXP SJA1105/SJA1110 support -dt-bindings: net: dsa: sja1105: document the PCS nodes -net: pcs: xpcs-plat: convert to regmap -net: pcs: xpcs: introduce xpcs_create_pcs_fwnode() -net: dsa: sja1105: remove sja1105_mdio_private -net: dsa: sja1105: transition OF-based MDIO drivers to standalone -mfd: core: add ability for cells to probe on a custom parent OF node -net: dsa: sja1105: include spi.h from sja1105.h -net: dsa: sja1105: prepare regmap for passing to child devices -net: mdio: add generic driver for NXP SJA1110 100BASE-TX embedded PHYs -net: mdio: add driver for NXP SJA1110 100BASE-T1 embedded PHYs -net: mdio-regmap: permit working with non-MMIO regmaps -net: dsa: sja1105: let phylink help with the replay of link callbacks net: dsa: microchip: Fix symetry in ksz_ptp_msg_irq_{setup/free}() net: dsa: microchip: Free previously initialized ports on init failures net: dsa: microchip: Don't free uninitialized ksz_irq net: dsa: microchip: ptp: Fix checks on irq_find_mapping() net: dsa: microchip: common: Fix checks on irq_find_mapping() -virtio_net: Add get ethtool flow rules ops -virtio_net: Add support for TCP and UDP ethtool rules -virtio_net: Add support for IPv6 ethtool steering -virtio_net: Implement IPv4 ethtool flow rules -virtio_net: Use existing classifier if possible -virtio_net: Implement layer 2 ethtool flow rules -virtio_net: Create a FF group for ethtool steering -virtio_net: Query and set flow filter caps -virtio: Expose object create and destroy API -virtio: Expose generic device capability operations -virtio: Add config_op for admin commands -virtio_pci: Remove supported_cap size build assert tools: ynl: cli: Display enum values in --list-attrs output tools: ynl: cli: Parse nested attributes in --list-attrs output tools: ynl: cli: Add --list-attrs option to show operation attributes @@ -69,36 +44,13 @@ net: ti: icssg-prueth: Add AF_XDP zero copy for TX net: ti: icssg-prueth: Add XSK pool helpers net: ti: icssg-prueth: Add functions to create and destroy Rx/Tx queues net: stmmac: dwc-qos-eth: simplify switch() in dwc_eth_dwmac_config_dt() -idpf: use desc_ring when checking completion queue DMA allocation net: stmmac: stmmac_is_jumbo_frm() returns boolean net: stmmac: stmmac_is_jumbo_frm() len should be unsigned net: vmxnet3: convert to use .get_rx_ring_count net: stmmac: convert priv->sph* to boolean and rename -MAINTAINERS: Add entry for XFRM documentation -net: Move XFRM documentation into its own subdirectory -Documentation: xfrm_sync: Number the fifth section -Documentation: xfrm_sysctl: Trim trailing colon in section heading -Documentation: xfrm_sync: Trim excess section heading characters -Documentation: xfrm_sync: Properly reindent list text -Documentation: xfrm_device: Separate hardware offload sublists -Documentation: xfrm_device: Use numbered list for offloading steps -Documentation: xfrm_device: Wrap iproute2 snippets in literal code block -pfkey: Deprecate pfkey -xfrm: Skip redundant replay recheck for the hardware offload path -xfrm: Refactor xfrm_input lock to reduce contention with RSS virtio_net: enhance wake/stop tx queue statistics accounting net: bonding: move bond_should_notify_peers, e.g. into rtnl lock block net: bonding: use workqueue to make sure peer notify updated in lacp mode -xfrm: fix memory leak in xfrm_add_acquire() -xfrm: Prevent locally generated packets from direct output in tunnel mode -xfrm: Determine inner GSO type from packet inner protocol -xfrm: Check inner packet family directly from skb_dst -xfrm: check all hash buckets for leftover states during netns deletion -xfrm: set err and extack on failure to create pcpu SA -xfrm: call xfrm_dev_state_delete when xfrm_state_migrate fails to add the state -xfrm: make state as DEAD before final put when migrate fails -xfrm: also call xfrm_state_delete_tunnel at destroy time for states that were never added -xfrm: drop SA reference in xfrm_state_update if dir doesn't match net: txgbe: support getting module EEPROM by page net: txgbe: delay to identify modules in .ndo_open net: txgbe: improve functions of AML 40G devices @@ -123,25 +75,7 @@ octeontx2-af: Skip TM tree print for disabled SQs net: phy: microchip_t1s: add SQI support for LAN867x Rev.D0 PHYs net: phy: phy-c45: add SQI and SQI+ support for OATC14 10Base-T1S PHYs atm/fore200e: Fix possible data race in fore200e_open() -selftests/vsock: add tests for namespace deletion and mode changes -selftests/vsock: add tests for host <-> vm connectivity with namespaces -selftests/vsock: add namespace tests for CID collisions -selftests/vsock: add tests for proc sys vsock ns_mode -selftests/vsock: prepare vm management helpers for namespaces -selftests/vsock: add namespace helpers to vmtest.sh -virtio: set skb owner of virtio_transport_reset_no_sock() reply -vsock: add netns support to virtio transports -vsock: reject bad VSOCK_NET_MODE_LOCAL configuration for G2H -vsock: add netns to vsock core -vsock: a per-net vsock NS mode state -selftest: netdevsim: test devlink default params -netdevsim: register a new devlink param with default value interface -net/mlx5: implement swp_l4_csum_mode via devlink params -devlink: support default values for param-get and param-set -devlink: refactor devlink_nl_param_value_fill_one() -devlink: pass extack through to devlink_param::get() l2tp: reset skb control buffer on xmit -tcp: Don't reinitialise tw->tw_transparent in tcp_time_wait(). net: phy: realtek: create rtl8211f_config_phy_eee() helper net: phy: realtek: eliminate priv->phycr1 variable net: phy: realtek: allow CLKOUT to be disabled on RTL8211F(D)(I)-VD-CG @@ -153,36 +87,20 @@ net/mlx5: Abort new commands if all command slots are stalled net/mlx5: Remove redundant bw_share minimal value assignment net/mlx5e: Recover SQ on excessive PTP TX timestamp delta net/mlx5: Refactor EEPROM query error handling to return status separately -bonding: 3ad: Add support for 1600G speed -net/mlx5e: Add 1600Gbps link modes -net: ethtool: Add support for 1600Gbps speed net/rds: Give each connection its own workqueue net/rds: Add per cp work queue -dt-bindings: net: cdns,macb: Add pic64gx compatibility net: lan966x: Fix the initialization of taprio -tools: ynltool: ignore *.d deps files tcp: add net.ipv4.tcp_rtt_threshold sysctl tcp: tcp_moderate_rcvbuf is only used in rx path net/mlx5: Clean up only new IRQ glue on request_irq() failure -devlink: rate: Unset parent pointer in devl_rate_nodes_destroy -ynl: samples: add tc filter example -net: phylink: add missing supported link modes for the fixed-link mptcp: fix a race in mptcp_pm_del_add_timer() -net: dsa: ks8995: Fix incorrect OF match table name dt-bindings: net: aspeed: add AST2700 MDIO compatible -tools: ynl: add YNL test framework -netlink: specs: support ipv4-or-v6 for dual-stack fields -tools: ynl: Add MAC address parsing support net/mlx5: Move SF dev table notifier registration outside the PF devlink lock net/mlx5: Move the SF table notifiers outside the devlink lock net/mlx5: Move the SF HW table notifier outside the devlink lock net/mlx5: Move the vhca event notifier outside of the devlink lock net/mlx5: Move the esw mode notifier chain outside the devlink lock net/mlx5: Initialize events outside devlink lock -net: use napi_skb_cache even in process context -net: __alloc_skb() cleanup -net: add a new @alloc parameter to napi_skb_cache_get() -kcm: Fix typo and add hyphen in Kconfig help text selftests: fib_tests: add fib6 from ra to static test ipv6: clear RA flags when adding a static route af_unix: Consolidate unix_schedule_gc() and wait_for_unix_gc(). @@ -192,5 +110,4 @@ af_unix: Don't call wait_for_unix_gc() on every sendmsg(). af_unix: Don't trigger GC from close() if unnecessary. af_unix: Simplify GC state. af_unix: Count cyclic SCC. -net: samsung: sxgbe: handle clk_prepare_enable() failures in sxgbe_open() net: dsa: microchip: lan937x: Fix RGMII delay tuning