Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

# Conflicts:
#	fs/eventpoll.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/kernel/irq.c
Simple merge

diff --cc drivers/infiniband/hw/irdma/main.h
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
Simple merge

diff --cc fs/eventpoll.c
index 9b06a0ab9c32ad60e0f8494e26c35d3ca898e650,2fecf66661e9ace450157ab46efec93b516c1d62..100376863a4451884dbb8d15b05d419c470cd8c8
--- 1/fs/eventpoll.c
--- 2/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@@ -447,8 -447,8 +447,8 @@@ static bool ep_busy_loop(struct eventpo
        if (!budget)
                budget = BUSY_POLL_BUDGET;
  
-       if (napi_id >= MIN_NAPI_ID && ep_busy_loop_on(ep)) {
+       if (napi_id_valid(napi_id) && ep_busy_loop_on(ep)) {
 -              napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end,
 +              napi_busy_loop(napi_id, ep_busy_loop_end,
                               ep, prefer_busy_poll, budget);
                if (ep_events_available(ep))
                        return true;

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/xdp/xsk.c
Simple merge