]> git.ipfire.org Git - thirdparty/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, 19 Jun 2025 20:00:24 +0000 (13:00 -0700)
Cross-merge networking fixes after downstream PR (net-6.16-rc3).

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
Documentation/netlink/specs/ethtool.yaml
MAINTAINERS
drivers/net/ethernet/airoha/airoha_ppe.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
drivers/ptp/ptp_clock.c
include/uapi/linux/ethtool_netlink_generated.h
net/ipv4/tcp_input.c
net/tipc/udp_media.c
tools/testing/selftests/net/Makefile

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