Jakub Kicinski bebd7b2626 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
  97c4e094a4 ("tests/ncdevmem: Fix double-free of queue array")
  2f1a805f32 ("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
  0afc44d8cd ("net: devmem: fix kernel panic when netlink socket close after module unload")
  bd61848900 ("net: devmem: Implement TX path")

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

2025-05-15 11:28:30 -07:00

..

advise.c

io_uring/advise: support 64-bit lengths

2024-06-16 14:54:55 -06:00

advise.h

…

alloc_cache.c

io_uring: add alloc_cache.c

2025-01-28 15:10:40 -07:00

alloc_cache.h

io_uring/net: convert to struct iou_vec

2025-03-07 13:41:08 -07:00

cancel.c

io_uring/cancel: add generic cancel helper

2025-02-17 05:34:45 -07:00

cancel.h

io_uring/cancel: add generic cancel helper

2025-02-17 05:34:45 -07:00

epoll.c

io_uring/epoll: add support for IORING_OP_EPOLL_WAIT

2025-02-20 07:59:56 -07:00

epoll.h

io_uring/epoll: add support for IORING_OP_EPOLL_WAIT

2025-02-20 07:59:56 -07:00

eventfd.c

io_uring/eventfd: ensure io_eventfd_signal() defers another RCU period

2025-01-09 07:16:45 -07:00

eventfd.h

…

fdinfo.c

io_uring/fdinfo: annotate racy sq/cq head/tail reads

2025-04-30 07:17:17 -06:00

fdinfo.h

…

filetable.c

io_uring: cache nodes and mapped buffers

2025-02-28 07:05:46 -07:00

filetable.h

io_uring/rsrc: pass 'struct io_ring_ctx' reference to rsrc helpers

2024-11-07 15:24:33 -07:00

fs.c

…

fs.h

…

futex.c

io_uring: introduce io_cache_free() helper

2025-03-05 07:38:55 -07:00

futex.h

io_uring: move cancelations to be io_uring_task based

2024-11-06 13:55:38 -07:00

io_uring.c

io_uring: ensure deferred completions are flushed for multishot

2025-05-07 07:55:15 -06:00

io_uring.h

io_uring: don't pass ctx to tw add remote helper

2025-03-28 17:14:01 -06:00

io-wq.c

Merge branch 'io_uring-6.14' into for-6.15/io_uring

2025-02-27 07:18:01 -07:00

io-wq.h

io_uring/io-wq: cache work->flags in variable

2025-02-17 05:34:45 -07:00

kbuf.c

io_uring/kbuf: reject zero sized provided buffers

2025-04-07 07:51:23 -06:00

kbuf.h

io_uring/kbuf: uninline __io_put_kbufs

2025-02-17 05:34:45 -07:00

Kconfig

io_uring: make zcrx depend on CONFIG_IO_URING

2025-03-31 07:07:44 -06:00

Makefile

io_uring/epoll: remove CONFIG_EPOLL guards

2025-02-20 07:59:56 -07:00

memmap.c

io_uring: add missing IORING_MAP_OFF_ZCRX_REGION in io_uring_mmap

2025-02-21 09:40:09 -07:00

memmap.h

io_uring/zcrx: add interface queue and refill queue

2025-02-17 05:41:03 -07:00

msg_ring.c

io_uring: don't pass ctx to tw add remote helper

2025-03-28 17:14:01 -06:00

msg_ring.h

io_uring/msg_ring: Drop custom destructor

2024-12-27 10:08:21 -07:00

napi.c

net: use napi_id_valid helper

2025-02-17 16:43:04 -08:00

napi.h

io_uring/napi: add static napi tracking strategy

2024-11-06 13:55:38 -07:00

net.c

io_uring/net: avoid import_ubuf for regvec send

2025-03-31 12:41:49 -06:00

net.h

io_uring/net: convert to struct iou_vec

2025-03-07 13:41:08 -07:00

nop.c

io_uring/nop: use io_find_buf_node()

2025-02-28 19:35:37 -07:00

nop.h

…

notif.c

io_uring: introduce type alias for io_tw_state

2025-02-17 05:34:50 -07:00

notif.h

…

opdef.c

Merge tag 'for-6.15/io_uring-epoll-wait-20250325' of git://git.kernel.dk/linux

2025-03-28 14:55:32 -07:00

opdef.h

io_uring: rearrange opdef flags by use pattern

2025-02-27 07:27:56 -07:00

openclose.c

…

openclose.h

…

poll.c

io_uring: unify STOP_MULTISHOT with IOU_OK

2025-03-10 07:14:18 -06:00

poll.h

io_uring: introduce type alias for io_tw_state

2025-02-17 05:34:50 -07:00

refs.h

io_uring: always do atomic put from iowq

2025-04-03 08:31:57 -06:00

register.c

io_uring/zcrx: add interface queue and refill queue

2025-02-17 05:41:03 -07:00

register.h

io_uring: temporarily disable registered waits

2024-11-15 09:58:34 -07:00

rsrc.c

io_uring/rsrc: ensure segments counts are correct on kbuf buffers

2025-04-17 11:59:12 -06:00

rsrc.h

Merge tag 'for-6.15/io_uring-rx-zc-20250325' of git://git.kernel.dk/linux

2025-03-28 13:45:52 -07:00

rw.c

Merge tag 'for-6.15/io_uring-reg-vec-20250327' of git://git.kernel.dk/linux

2025-03-28 15:07:04 -07:00

rw.h

io_uring/rw: implement vectored registered rw

2025-03-07 09:07:29 -07:00

slist.h

…

splice.c

io_uring/rsrc: avoid NULL check in io_put_rsrc_node()

2025-02-17 05:34:46 -07:00

splice.h

io_uring/splice: open code 2nd direct file assignment

2024-10-29 13:43:28 -06:00

sqpoll.c

io_uring/sqpoll: Increase task_work submission batch size

2025-05-09 07:56:53 -06:00

sqpoll.h

…

statx.c

io_statx_prep(): use getname_uflags()

2024-11-13 11:44:30 -05:00

statx.h

…

sync.c

…

sync.h

…

tctx.c

io_uring/tctx: work around xa_store() allocation error issue

2024-11-29 07:20:28 -07:00

tctx.h

…

timeout.c

Merge tag 'for-6.15/io_uring-20250322' of git://git.kernel.dk/linux

2025-03-26 17:56:00 -07:00

timeout.h

io_uring: move cancelations to be io_uring_task based

2024-11-06 13:55:38 -07:00

truncate.c

…

truncate.h

…

uring_cmd.c

io_uring: cleanup {g,s]etsockopt sqe reading

2025-03-31 07:08:46 -06:00

uring_cmd.h

io_uring: hide caches sqes from drivers

2025-03-31 07:08:34 -06:00

waitid.c

io_uring/waitid: use io_is_compat()

2025-02-24 12:10:38 -07:00

waitid.h

io_uring: move cancelations to be io_uring_task based

2024-11-06 13:55:38 -07:00

xattr.c

replace do_getxattr() with saner helpers.

2024-11-06 12:59:39 -05:00

xattr.h

…

zcrx.c

net: devmem: Implement TX path

2025-05-13 11:12:48 +02:00

zcrx.h

io_uring/zcrx: fix late dma unmap for a dead dev

2025-04-18 06:12:10 -06:00