]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bdcfaf 3cf0a98)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 6 Feb 2025 23:18:14 +0000 (15:18 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 6 Feb 2025 23:19:00 +0000 (15:19 -0800)
Cross-merge networking fixes after downstream PR (net-6.14-rc2).

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
include/linux/netdevice.h patch | diff1 | diff2 | blob | history
net/core/dev.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/netdevice.h
Simple merge
diff --cc net/core/dev.c
Simple merge
A mirror of Linus' kernel repository