Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

Conflicts:

tools/testing/selftests/drivers/net/hw/ncdevmem.c
  97c4e094a4b2 ("tests/ncdevmem: Fix double-free of queue array")
  2f1a805f32ba ("selftests: ncdevmem: Implement devmem TCP TX")
https://lore.kernel.org/20250514122900.1e77d62d@canb.auug.org.au

Adjacent changes:

net/core/devmem.c
net/core/devmem.h
  0afc44d8cdf6 ("net: devmem: fix kernel panic when netlink socket close after module unload")
  bd61848900bf ("net: devmem: Implement TX path")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/b53/b53_common.c
Simple merge

diff --cc drivers/net/dsa/b53/b53_regs.h
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/libwx/wx_hw.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
Simple merge

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

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/devmem.c
Simple merge

diff --cc net/core/devmem.h
Simple merge

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

diff --cc tools/net/ynl/pyynl/ynl_gen_c.py
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge

diff --cc tools/testing/selftests/drivers/net/hw/ncdevmem.c
index f801a1b3545f039572e8ecbf4430ad68e5a1bd02,9d48004ff1a178264bf591cbb1c0f90de3bfe8a0..ca723722a810515687c9a0f1dff748c2c6a96a12
--- 1/tools/testing/selftests/drivers/net/hw/ncdevmem.c
--- 2/tools/testing/selftests/drivers/net/hw/ncdevmem.c
+++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c
@@@ -507,7 -431,23 +507,23 @@@ static int parse_address(const char *st
        return 0;
  }
  
 -int do_server(struct memory_buffer *mem)
+ static struct netdev_queue_id *create_queues(void)
+ {
+       struct netdev_queue_id *queues;
+       size_t i = 0;
+ 
+       queues = calloc(num_queues, sizeof(*queues));
+       for (i = 0; i < num_queues; i++) {
+               queues[i]._present.type = 1;
+               queues[i]._present.id = 1;
+               queues[i].type = NETDEV_QUEUE_TYPE_RX;
+               queues[i].id = start_queue + i;
+       }
+ 
+       return queues;
+ }
+ 
 +static int do_server(struct memory_buffer *mem)
  {
        char ctrl_data[sizeof(int) * 20000];
        struct netdev_queue_id *queues;