projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
afc783f
5c8013a
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Thu, 12 Jun 2025 17:08:24 +0000
(10:08 -0700)
committer
Jakub 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
patch
|
diff1
|
diff2
|
blob
|
history
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/airoha/airoha_ppe.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/ptp/ptp_clock.c
patch
|
diff1
|
diff2
|
blob
|
history
include/uapi/linux/ethtool_netlink_generated.h
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_input.c
patch
|
diff1
|
diff2
|
blob
|
history
net/tipc/udp_media.c
patch
|
diff1
|
diff2
|
blob
|
history
tools/testing/selftests/net/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/netlink/specs/ethtool.yaml
Simple merge
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/ethernet/airoha/airoha_ppe.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge
diff --cc
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
Simple merge
diff --cc
drivers/ptp/ptp_clock.c
Simple merge
diff --cc
include/uapi/linux/ethtool_netlink_generated.h
Simple merge
diff --cc
net/ipv4/tcp_input.c
Simple merge
diff --cc
net/tipc/udp_media.c
Simple merge
diff --cc
tools/testing/selftests/net/Makefile
Simple merge