Merge branch 'io_uring-5.9' into for-5.10/io_uring
authorJens Axboe <axboe@kernel.dk>
Thu, 1 Oct 2020 02:32:25 +0000 (20:32 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 1 Oct 2020 02:32:25 +0000 (20:32 -0600)
* io_uring-5.9:
  io_uring: fix async buffered reads when readahead is disabled
  io_uring: fix potential ABBA deadlock in ->show_fdinfo()
  io_uring: always delete double poll wait entry on match

1  2 
fs/io_uring.c
mm/filemap.c

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