Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-02-06--09-00 (net-next-6.14-8483-gdcb4e6cc07f0) remotes/brancher/net-next-2025-02-06--12-00 (net-next-6.14-8512-g72ba9f0e651f) ==== BASE DIFF ==== Documentation/netlink/genetlink-c.yaml | 5 +- Documentation/netlink/genetlink-legacy.yaml | 5 +- Documentation/netlink/genetlink.yaml | 5 +- MAINTAINERS | 16 + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 64 ++- drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 4 +- .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 5 - drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 22 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 11 +- .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 2 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 582 +++++++++++++++++---- .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 39 +- .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 15 +- drivers/net/ethernet/mellanox/mlx5/core/port.c | 3 + drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c | 36 ++ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 35 +- drivers/net/phy/phy-core.c | 20 +- include/linux/mlx5/driver.h | 33 +- include/linux/mlx5/port.h | 3 + include/uapi/linux/ethtool.h | 18 + net/ethtool/common.c | 42 ++ tools/net/ynl/pyynl/ynl_gen_c.py | 8 +- 28 files changed, 788 insertions(+), 197 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.pZKPc0POwC b/tmp/tmp.4L0fkKAgGF index f0ba6fe32997..7cb78b18d9a1 100644 --- a/tmp/tmp.pZKPc0POwC +++ b/tmp/tmp.4L0fkKAgGF @@ -5,6 +5,19 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +ptp: Add file permission checks on PHC +selftests: bonding: fix incorrect mac address +bonding: fix incorrect MAC address setting to receive NS messages +tcp: rename inet_csk_{delete|reset}_keepalive_timer() +net: phy: dp83tg720: Add randomized polling intervals for unstable link detection +net: phy: Add support for driver-specific next update time +tcp: do not export tcp_parse_mss_option() and tcp_mtup_init() +fib: rules: Convert RTM_DELRULE to per-netns RTNL. +fib: rules: Add error_free label in fib_nl_delrule(). +fib: rules: Convert RTM_NEWRULE to per-netns RTNL. +fib: rules: Split fib_nl2rule(). +fib: rules: Pass net to fib_nl2rule() instead of skb. +fib: rules: Don't check net in rule_exists() and rule_find(). net: fib_rules: annotate data-races around rule->[io]ifindex net: sxgbe: rework EEE handling to use PHY negotiation results netconsole: allow selection of egress interface via MAC address @@ -83,7 +96,6 @@ net: pktgen: fix 'rate 0' error handling (return -EINVAL) net: pktgen: fix hex32_arg parsing for short reads net: pktgen: enable 'param=value' parsing net: pktgen: replace ENOTSUPP with EOPNOTSUPP -Revert "net: stmmac: Specify hardware capability value when FIFO size isn't specified" net: ibm: emac: Use of_get_available_child_by_name() net: ethernet: actions: Use of_get_available_child_by_name() net: ethernet: mtk_eth_soc: Use of_get_available_child_by_name() @@ -102,8 +114,6 @@ ice: use napi's irq affinity bnxt: use napi's irq affinity net: napi: add CPU affinity to napi_config net: move ARFS rmap management to core -MAINTAINERS: add a sample ethtool section entry -MAINTAINERS: add entry for ethtool net: add helpers for setting a memory provider on an rx queue net: page_pool: add memory provider helpers net: prepare for non devmem TCP memory providers @@ -129,8 +139,4 @@ mlxsw: core: Remove debug prints net: fec: Refactor MAC reset to function selftests/net: Add selftest for IPv4 RTM_GETMULTICAST support netlink: support dumping IPv4 multicast addresses -eth: fbnic: set IFF_UNICAST_FLT to avoid enabling promiscuous mode when adding unicast addrs -eth: fbnic: add MAC address TCAM to debugfs -tools: ynl-gen: support limits using definitions -tools: ynl-gen: don't output external constants ax25: Fix refcount leak caused by setting SO_BINDTODEVICE sockopt