]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge branch 'for-5.17/io_uring-getdents64' into for-next
authorJens Axboe <axboe@kernel.dk>
Tue, 21 Dec 2021 19:16:27 +0000 (12:16 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 21 Dec 2021 19:16:27 +0000 (12:16 -0700)
* for-5.17/io_uring-getdents64:
  io_uring: add support for getdents64
  fs: split off vfs_getdents function of getdents64 syscall
  fs: add offset parameter to iterate_dir function

1  2 
fs/io_uring.c
fs/ksmbd/smb2pdu.c
include/linux/fs.h

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