Merge branch 'io_uring-6.10' into io_uring-exit-cancel
authorJens Axboe <axboe@kernel.dk>
Tue, 4 Jun 2024 17:11:16 +0000 (11:11 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 4 Jun 2024 17:11:16 +0000 (11:11 -0600)
commite0e49857a412c7a4550bf6ddb39e4b6402cdd0dd
tree02918ed0b22db703493b53922065d6b4efa1e7d1
parent2ab79514109578fc4b6df90633d500cf281eb689
parent73254a297c2dd094abec7c9efee32455ae875bdf
Merge branch 'io_uring-6.10' into io_uring-exit-cancel

* io_uring-6.10:
  io_uring: fix possible deadlock in io_register_iowq_max_workers()
  io_uring/io-wq: avoid garbage value of 'match' in io_wq_enqueue()
  io_uring/napi: fix timeout calculation
  io_uring: check for non-NULL file pointer in io_file_can_poll()