Merge tag 'locks-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Feb 2023 19:10:38 +0000 (11:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Feb 2023 19:10:38 +0000 (11:10 -0800)
commit575a7e0f812a4968ad1e0c00026692ede040e13f
treec669f2892c6894b20a8f1a1a194f26d00c7de243
parent219ac97a486c1ad9c110cb96ebdad7ba068236fb
parentc65454a947263dfdf482076388aaed60af84ca2f
Merge tag 'locks-v6.3' of git://git./linux/kernel/git/jlayton/linux

Pull file locking updates from Jeff Layton:
 "The main change here is that I've broken out most of the file locking
  definitions into a new header file. I also went ahead and completed
  the removal of locks_inode function"

* tag 'locks-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  fs: remove locks_inode
  filelock: move file locking definitions to separate header file
fs/ceph/caps.c
fs/cifs/file.c
fs/ksmbd/smb2pdu.c
fs/nfsd/netns.h
fs/nfsd/nfs4state.c