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)
commite47fd9beb1cec00f43077d6b6238c8d30bd03ecf
tree504747e4a88042565ad7957260915242ff687b61
parent91d516d4de48532d967a77967834e00c8c53dfe6
parentee9a43b7cfe2d8a3520335fea7d8ce71b8cabd9d
Merge git://git./linux/kernel/git/netdev/net

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>
MAINTAINERS
net/l2tp/l2tp_core.c