Merge tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Oct 2022 00:13:18 +0000 (17:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Oct 2022 00:13:18 +0000 (17:13 -0700)
Pull vfs file updates from Al Viro:
 "struct file-related stuff"

* tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  dma_buf_getfile(): don't bother with ->f_flags reassignments
  Change calling conventions for filldir_t
  locks: fix TOCTOU race when granting write lease

1  2 
arch/alpha/kernel/osf_sys.c
drivers/dma-buf/dma-buf.c
fs/internal.h
fs/ksmbd/smb2pdu.c
fs/nfsd/nfs4recover.c
fs/nfsd/vfs.c
fs/open.c
include/linux/fs.h

Simple merge
Simple merge
diff --cc fs/internal.h
Simple merge
Simple merge
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
diff --cc fs/open.c
Simple merge
Simple merge