]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 24 Apr 2025 18:14:16 +0000 (11:14 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 24 Apr 2025 18:20:52 +0000 (11:20 -0700)
commit5565acd1e6c4a1994e0ba32281ec10b69c0be14d
tree2856eea8e8fd624c9f8e29068ef24b65c663b074
parentbef4f1156b74721b7d111114538659031119b6f2
parent087a9eb9e5978e3ba362e1163691e41097e8ca20
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.15-rc4).

This pull includes wireless and a fix to vxlan which isn't
in Linus's tree just yet. The latter creates with a silent conflict
/ build breakage, so merging it now to avoid causing problems.

drivers/net/vxlan/vxlan_vnifilter.c
  094adad91310 ("vxlan: Use a single lock to protect the FDB table")
  087a9eb9e597 ("vxlan: vnifilter: Fix unlocked deletion of default FDB entry")
https://lore.kernel.org/20250423145131.513029-1-idosch@nvidia.com

No "normal" conflicts, or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
MAINTAINERS
drivers/net/dsa/mt7530.c
drivers/net/phy/dp83822.c
drivers/net/vxlan/vxlan_vnifilter.c
include/linux/mm.h
mm/page_alloc.c
net/core/netdev-genl.c