Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-01-07--00-00 (v6.13-rc5-948-g80d4fb8ae1fd) remotes/brancher/net-next-2025-01-07--03-00 (v6.13-rc5-955-g36afc2ba510f) ==== BASE DIFF ==== drivers/net/ethernet/amd/pds_core/devlink.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 38 ++++- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 3 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +- .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 4 +- .../mellanox/mlx5/core/steering/hws/action.c | 159 +++++++++++++-------- .../mellanox/mlx5/core/steering/hws/action.h | 9 +- .../ethernet/mellanox/mlx5/core/steering/hws/bwc.c | 54 ++++--- .../ethernet/mellanox/mlx5/core/steering/hws/bwc.h | 12 +- .../ethernet/mellanox/mlx5/core/steering/hws/cmd.c | 95 +++--------- .../ethernet/mellanox/mlx5/core/steering/hws/cmd.h | 13 +- .../mellanox/mlx5/core/steering/hws/context.c | 29 ++-- .../mellanox/mlx5/core/steering/hws/context.h | 4 +- .../mellanox/mlx5/core/steering/hws/debug.c | 36 ++--- .../mellanox/mlx5/core/steering/hws/definer.c | 2 +- .../mellanox/mlx5/core/steering/hws/definer.h | 2 +- .../mellanox/mlx5/core/steering/hws/matcher.c | 36 ++--- .../mellanox/mlx5/core/steering/hws/pat_arg.c | 2 +- .../mellanox/mlx5/core/steering/hws/pat_arg.h | 2 +- .../mellanox/mlx5/core/steering/hws/pool.c | 4 +- .../ethernet/mellanox/mlx5/core/steering/hws/prm.h | 42 ------ .../mellanox/mlx5/core/steering/hws/rule.c | 2 +- .../mellanox/mlx5/core/steering/hws/send.c | 1 + .../mellanox/mlx5/core/steering/hws/table.c | 22 ++- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +- drivers/net/pcs/pcs-lynx.c | 13 ++ drivers/net/pcs/pcs-mtk-lynxi.c | 4 + drivers/net/pcs/pcs-xpcs.c | 5 +- drivers/net/phy/phylink.c | 11 ++ drivers/nfc/st21nfca/dep.c | 18 ++- include/linux/netdevice.h | 2 +- include/linux/pcs/pcs-xpcs.h | 1 - include/linux/phylink.h | 3 + include/net/ax25.h | 10 +- net/ax25/af_ax25.c | 12 +- net/ax25/ax25_dev.c | 4 +- net/ax25/ax25_ip.c | 3 +- net/ax25/ax25_out.c | 22 ++- net/ax25/ax25_route.c | 2 + net/hsr/hsr_main.h | 1 + net/hsr/hsr_slave.c | 4 +- 41 files changed, 356 insertions(+), 348 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.cccQS5AML3 b/tmp/tmp.A2cHZyKWfC index 20f64b26986a..0afc2f896c46 100644 --- a/tmp/tmp.cccQS5AML3 +++ b/tmp/tmp.A2cHZyKWfC @@ -3,6 +3,19 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +selftests: drv-net: test drivers sleeping in ndo_get_stats64 +net: homa: create Makefile and Kconfig +net: homa: create homa_plumbing.c homa_utils.c +net: homa: create homa_timer.c +net: homa: create homa_outgoing.c +net: homa: create homa_incoming.c +net: homa: create homa_sock.h and homa_sock.c +net: homa: create homa_peer.h and homa_peer.c +net: homa: create homa_rpc.h and homa_rpc.c +net: homa: create homa_pool.h and homa_pool.c +net: homa: create shared Homa header files +net: homa: create homa_wire.h +net: homa: define user-visible API for Homa netdev: prevent accessing NAPI instances from another namespace r8169: add support for reading over-temp threshold r8169: prepare for extending hwmon support @@ -50,9 +63,6 @@ wireguard: use rhashtables instead of hashtables net: watchdog: rename __dev_watchdog_up() and dev_watchdog_down() net: ethtool: Use hwprov under rcu_read_lock netlink: support dumping IPv4 multicast addresses -netlink: specs: rt_link: decode ip6tnl, vti and vti6 link attrs -tools: ynl: print some information about attribute we can't parse -tools: ynl: correctly handle overrides of fields in subset usbnet: ipheth: document scope of NCM implementation usbnet: ipheth: fix DPE OoB read usbnet: ipheth: refactor NCM datagram loop @@ -75,10 +85,8 @@ 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 -octeontx2-pf: mcs: Remove dead code and semi-colon from rsrc_name() tls: Fix tls_sw_sendmsg error handling net/smc: fix data error when recvmsg with MSG_PEEK flag -nfc: st21nfca: Drop unneeded null check in st21nfca_tx_work() selftests: net: Add test cases for link and peer netns selftests: net: Add python context manager for netns entering rtnetlink: Create link directly in target net namespace @@ -93,60 +101,27 @@ rtnetlink: Lookup device in target netns when creating link bridge: Make br_is_nd_neigh_msg() accept pointer to "const struct sk_buff" dev: Hold per-netns RTNL in (un)?register_netdev(). rtnetlink: Add rtnl_net_lock_killable(). -bnxt_en: Fix DIM shutdown -bnxt_en: Fix possible memory leak when hwrm_req_replace fails eth: fbnic: update fbnic_poll return value -ax25: rcu protect dev->ax25_ptr -pds_core: limit loop over fw name list +selftests: net: test listing NAPI vs queue resets +netdevsim: add debugfs-triggered queue reset +netdevsim: add queue management API support +netdevsim: add queue alloc/free helpers +netdevsim: allocate rqs individually +netdevsim: support NAPI config +netdev: define NETDEV_INTERNAL +net: make sure we retain NAPI ordering on netdev->napi_list net: don't dump Tx and uninitialized NAPIs -selftest: net-drv: hds: add test for HDS feature -netdevsim: add HDS feature -bnxt_en: add support for hds-thresh ethtool command -bnxt_en: add support for tcp-data-split ethtool command -bnxt_en: add support for rx-copybreak ethtool command -net: disallow setup single buffer XDP when tcp-data-split is enabled. -net: ethtool: add ring parameter filtering -net: devmem: add ring parameter filtering -net: ethtool: add support for configuring hds-thresh -net: ethtool: add hds_config member in ethtool_netdev_state ptp: limit number of virtual clocks per physical clock -netconsole: selftest: verify userdata entry limit -netconsole: selftest: Delete all userdata keys -netconsole: selftest: Split the helpers from the selftest -netconsole: Warn if MAX_USERDATA_ITEMS limit is exceeded net: airoha: Add sched HTB offload support net: airoha: Add sched ETS offload support net: airoha: Introduce ndo_select_queue callback net: airoha: Enable Tx drop capability for each Tx DMA ring selftests/net: packetdrill: report benign debug flakes as xfail -net: pcs: xpcs: make xpcs_get_interfaces() static -net: stmmac: use PCS supported_interfaces -net: pcs: lynx: fill in PCS supported_interfaces -net: pcs: mtk-lynxi: fill in PCS supported_interfaces -net: pcs: xpcs: fill in PCS supported_interfaces -net: phylink: add support for PCS supported_interfaces bitmap -net: hsr: remove one synchronize_rcu() from hsr_del_port() net: stmmac: Set dma_sync_size to zero for discarded frames net: ti: icssg-prueth: Add Support for Multicast filtering with VLAN in HSR mode net: ti: icssg-prueth: Add Multicast Filtering support for VLAN in MAC mode net: ti: icssg-prueth: Add VLAN support in EMAC mode -cxgb4: Avoid removal of uninserted tid net: phy: microchip_rds_ptp : Add PEROUT feature library for RDS PTP supported phys net: phy: microchip_t1: Enable GPIO pins specific to lan887x phy for PEROUT signals net: phy: microchip_rds_ptp: Header file library changes for PEROUT -net/mlx5: HWS, set timeout on polling for completion -net/mlx5: HWS, support flow sampler destination -net/mlx5: HWS, use the right size when writing arg data -net/mlx5: HWS, handle returned error value in pool alloc -net/mlx5: HWS, fix definer's HWS_SET32 macro for negative offset -net/mlx5: HWS, separate SQ that HWS uses from the usual traffic SQs -net/mlx5: HWS, num_of_rules counter on matcher should be atomic -net/mlx5: HWS, reduce memory consumption of a matcher struct -net/mlx5: HWS, remove wrong deletion of the miss table list -net/mlx5: HWS, change error flow on matcher disconnect -net/mlx5: HWS, add error message on failure to move rules -net/mlx5: HWS, simplify allocations as we support only FDB -net/mlx5: HWS, denote how refcounts are protected -net/mlx5: HWS, remove implementation of unused FW commands -net/mlx5: HWS, remove the use of duplicated structs net/smc: use the correct ndev to find pnetid by pnetid table