Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-01-14--09-00 (v6.13-rc6-1147-g91621a104c14) remotes/brancher/net-next-2025-01-14--12-00 (v6.13-rc6-1158-g34745f05a88f) ==== BASE DIFF ==== .../diagnostic/twisted_pair_layer1_diagnostics.rst | 39 +++-- Documentation/networking/ethtool-netlink.rst | 1 + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 175 +++++++++++++++------ drivers/net/ethernet/ti/icssg/icssg_prueth.h | 8 + drivers/net/gtp.c | 26 +-- drivers/net/pfcp.c | 15 +- drivers/net/phy/Kconfig | 4 +- drivers/net/phy/dp83td510.c | 112 +++++++++++++ drivers/net/phy/dp83tg720.c | 161 +++++++++++++++++++ drivers/net/phy/phy.c | 63 ++++++++ drivers/net/phy/phy_device.c | 2 + include/linux/ethtool.h | 23 +++ include/linux/if_hsr.h | 17 ++ include/linux/netdevice.h | 3 + include/linux/phy.h | 57 +++++++ include/linux/phylib_stubs.h | 42 +++++ include/net/netfilter/nf_conntrack_ecache.h | 12 ++ include/uapi/linux/ethtool.h | 2 + include/uapi/linux/ethtool_netlink.h | 14 ++ include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 + net/core/dev_addr_lists.c | 7 +- net/ethtool/linkstate.c | 26 +-- net/ethtool/netlink.h | 1 + net/ethtool/stats.c | 55 +++++++ net/ethtool/strset.c | 5 + net/hsr/hsr_device.c | 13 ++ net/hsr/hsr_main.h | 9 -- net/ipv4/udp.c | 46 +++--- net/netfilter/ipvs/ip_vs_conn.c | 50 +++--- net/netfilter/nf_conntrack_ecache.c | 23 +++ net/netfilter/nf_conntrack_netlink.c | 25 +++ net/netfilter/nf_tables_api.c | 7 +- net/netfilter/xt_hashlimit.c | 6 +- net/sched/sch_generic.c | 22 +-- net/vmw_vsock/af_vsock.c | 18 +++ net/vmw_vsock/virtio_transport_common.c | 36 +++-- net/vmw_vsock/vsock_bpf.c | 9 ++ 37 files changed, 973 insertions(+), 162 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.zge1XHNrJL b/tmp/tmp.FQqomr5gqB index 128f6c5f34cd..f317ff6d9158 100644 --- a/tmp/tmp.zge1XHNrJL +++ b/tmp/tmp.FQqomr5gqB @@ -2,6 +2,8 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +selftests/net/ipsec: Fix Null pointer dereference in rtattr_pack() +Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux tcp_cubic: fix incorrect HyStart round start detection net/ncsi: fix state race during channel probe completion net: dsa: microchip: Add SGMII port support to KSZ9477 switch @@ -92,10 +94,6 @@ af_unix: Set drop reason in __unix_gc(). af_unix: Set drop reason in unix_sock_destructor(). af_unix: Set drop reason in unix_release_sock(). net: dropreason: Gather SOCKET_ drop reasons. -netfilter: conntrack: add conntrack event timestamp -netfilter: xt_hashlimit: htable_selective_cleanup() optimization -ipvs: speed up reads from ip_vs_conn proc file -netfilter: nf_tables: remove the genmask parameter selftests: net: Adapt ethtool mq tests to fix in qdisc graft net: sched: Disallow replacing of child qdisc from one parent to another net: sched: fix ets qdisc OOB Indexing @@ -117,25 +115,7 @@ net: pse-pd: tps23881: Simplify function returns by removing redundant checks net: pse-pd: Add power limit check net: pse-pd: Avoid setting max_uA in regulator constraints net: pse-pd: Remove unused pse_ethtool_get_pw_limit function declaration -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: phy: dp83tg720: add statistics support -net: phy: dp83td510: add statistics support -net: phy: introduce optional polling interface for PHY statistics -Documentation: networking: update PHY error counter diagnostics in twisted pair guide -net: ethtool: add support for structured PHY statistics -net: ethtool: plumb PHY stats to PHY drivers -ethtool: linkstate: migrate linkstate functions to support multi-PHY setups -net: phy: microchip_t1: depend on PTP_1588_CLOCK_OPTIONAL -pfcp: Destroy device along with udp socket's netns dismantle. -gtp: Destroy device along with udp socket's netns dismantle. -gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp(). -udp: Make rehash4 independent in udp_lib_rehash() -net: sched: calls synchronize_net() only when needed +net/mlx5: Add nic_cap_reg and vhca_icm_ctrl registers +net/mlx5: SHAMPO: Introduce new SHAMPO specific HCA caps +net/mlx5: Add support for MRTCQ register +net/mlx5: Update mlx5_ifc to support FEC for 200G per lane link modes