]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91d516d ee9a43b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 8 Aug 2024 21:03:51 +0000 (14:03 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Aug 2024 21:04:17 +0000 (14:04 -0700)
Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

Link: https://patch.msgid.link/20240808170148.3629934-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
net/l2tp/l2tp_core.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc net/l2tp/l2tp_core.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.