]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 12 Jun 2025 17:08:24 +0000 (10:08 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 21 Aug 2025 18:33:15 +0000 (11:33 -0700)
Cross-merge networking fixes after downstream PR (net-6.17-rc3).

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
MAINTAINERS
drivers/net/ethernet/airoha/airoha_ppe.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c
drivers/net/phy/mscc/mscc.h
drivers/net/phy/mscc/mscc_main.c
net/bridge/br_multicast.c
tools/testing/selftests/net/tls.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge