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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mt7530.c
Simple merge

diff --cc drivers/net/phy/dp83822.c
Simple merge

diff --cc drivers/net/vxlan/vxlan_vnifilter.c
index 336cd0e203094b51f8bef44e0322487440ba57e4,06d19e90eadb5911b02cc6e8f3bd9bc843583d3e..186d0660669aab1d13f793d45e6d7115ce33ff01
--- 1/drivers/net/vxlan/vxlan_vnifilter.c
--- 2/drivers/net/vxlan/vxlan_vnifilter.c
+++ b/drivers/net/vxlan/vxlan_vnifilter.c
@@@ -624,7 -627,11 +624,8 @@@ static void vxlan_vni_delete_group(stru
         * default dst remote_ip previously added for this vni
         */
        if (!vxlan_addr_any(&vninode->remote_ip) ||
-           !vxlan_addr_any(&dst->remote_ip))
+           !vxlan_addr_any(&dst->remote_ip)) {
 -              u32 hash_index = fdb_head_index(vxlan, all_zeros_mac,
 -                                              vninode->vni);
 -
 -              spin_lock_bh(&vxlan->hash_lock[hash_index]);
++              spin_lock_bh(&vxlan->hash_lock);
                __vxlan_fdb_delete(vxlan, all_zeros_mac,
                                   (vxlan_addr_any(&vninode->remote_ip) ?
                                   dst->remote_ip : vninode->remote_ip),
@@@ -632,6 -639,8 +633,8 @@@
                                   vninode->vni, vninode->vni,
                                   dst->remote_ifindex,
                                   true);
 -              spin_unlock_bh(&vxlan->hash_lock[hash_index]);
++              spin_unlock_bh(&vxlan->hash_lock);
+       }
  
        if (vxlan->dev->flags & IFF_UP) {
                if (vxlan_addr_multicast(&vninode->remote_ip) &&

diff --cc include/linux/mm.h
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/core/netdev-genl.c
Simple merge