]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'io_uring-5.9-2020-10-02' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Oct 2020 21:38:10 +0000 (14:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Oct 2020 21:38:10 +0000 (14:38 -0700)
Pull io_uring fixes from Jens Axboe:

 - fix for async buffered reads if read-ahead is fully disabled (Hao)

 - double poll match fix

 - ->show_fdinfo() potential ABBA deadlock complaint fix

* tag 'io_uring-5.9-2020-10-02' of git://git.kernel.dk/linux-block:
  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