]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge branch 'for-5.15/io_uring' into for-next
authorJens Axboe <axboe@kernel.dk>
Sun, 29 Aug 2021 22:12:47 +0000 (16:12 -0600)
committerJens Axboe <axboe@kernel.dk>
Sun, 29 Aug 2021 22:12:47 +0000 (16:12 -0600)
* for-5.15/io_uring:
  io_uring: allow updating linked timeouts
  io_uring: keep ltimeouts in a list
  io_uring: support CLOCK_BOOTTIME/REALTIME for timeouts
  io-wq: provide a way to limit max number of workers

1  2 
fs/io_uring.c
include/uapi/linux/io_uring.h

diff --cc fs/io_uring.c
Simple merge
Simple merge