Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-01-10--09-00 (v6.13-rc6-971-g05e332e06fcd) remotes/brancher/net-next-2025-01-10--12-00 (v6.13-rc6-1004-gf228c7fb405c) ==== BASE DIFF ==== Documentation/networking/xfrm_device.rst | 3 +- drivers/net/dsa/qca/qca8k-8xxx.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 37 +- include/net/xfrm.h | 44 + include/uapi/linux/in.h | 2 + include/uapi/linux/ip.h | 16 + include/uapi/linux/ipsec.h | 3 +- include/uapi/linux/snmp.h | 2 + include/uapi/linux/xfrm.h | 9 +- net/ipv4/esp4.c | 3 +- net/ipv6/esp6.c | 3 +- net/netfilter/nft_xfrm.c | 3 +- net/xfrm/Kconfig | 16 + net/xfrm/Makefile | 1 + net/xfrm/trace_iptfs.h | 218 ++ net/xfrm/xfrm_compat.c | 10 +- net/xfrm/xfrm_device.c | 4 +- net/xfrm/xfrm_input.c | 18 +- net/xfrm/xfrm_iptfs.c | 2764 ++++++++++++++++++++ net/xfrm/xfrm_output.c | 6 + net/xfrm/xfrm_policy.c | 26 +- net/xfrm/xfrm_proc.c | 2 + net/xfrm/xfrm_replay.c | 1 + net/xfrm/xfrm_state.c | 84 + net/xfrm/xfrm_user.c | 77 + 26 files changed, 3314 insertions(+), 43 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.DmVCA4J3OS b/tmp/tmp.OhnajR8yzJ index 7221722c22eb..09b595729b73 100644 --- a/tmp/tmp.DmVCA4J3OS +++ b/tmp/tmp.OhnajR8yzJ @@ -3,6 +3,20 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +net: phy: motorcomm: Fix yt8521 Speed issue +net: ethernet: ti: am65-cpsw: VLAN-aware CPSW only if !DSA +net: mii: Fix the Speed display when the network cable is not connected +vsock: prevent null-ptr-deref in vsock_*[has_data|has_space] +vsock: reset socket state when de-assigning the transport +vsock/virtio: cancel close work in the destructor +vsock/bpf: return early if transport is not assigned +vsock/virtio: discard packets if the transport changes +net: ti: icssg-prueth: Add Support for Multicast filtering with VLAN in HSR mode +net: hsr: Create and export hsr_get_port_ndev() +net: ti: icssg-prueth: Add Multicast Filtering support for VLAN in MAC mode +net: ti: icssg-prueth: Add VLAN support in EMAC mode +net: wangxun: Replace the judgement of MAC type with flags +net: txgbe: Add basic support for new AML devices net: rfkill: gpio: allow booting in blocked state dt-bindings: net: rfkill-gpio: enable booting in blocked state net: phy: dp83tg720: add statistics support @@ -24,7 +38,6 @@ net: warn during dump if NAPI list is not sorted selftests/net/forwarding: teamd command not found tls: skip setting sk_write_space on rekey net: ethernet: ti: cpsw: fix the comment regarding VLAN-aware ALE -net: dsa: qca8k: Use of_property_present() for non-boolean properties net: sched: calls synchronize_net() only when needed net: stmmac: sti: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() net: phylink: provide fixed state for 1000base-X and 2500base-X