]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge branch 'for-5.15/io_uring' into for-next
authorJens Axboe <axboe@kernel.dk>
Tue, 31 Aug 2021 01:39:54 +0000 (19:39 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 31 Aug 2021 01:39:54 +0000 (19:39 -0600)
* for-5.15/io_uring:
  io_uring: IORING_OP_WRITE needs hash_reg_file set
  io-wq: split bounded and unbounded work into separate lists

1  2 
fs/io_uring.c

diff --cc fs/io_uring.c
Simple merge