Merge tag 'locks-v6.3' of git://git.kernel.org/pub/scm/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

diff --cc fs/ceph/caps.c
Simple merge

diff --cc fs/cifs/file.c
Simple merge

diff --cc fs/ksmbd/smb2pdu.c
Simple merge

diff --cc fs/nfsd/netns.h
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge