Merge remote-tracking branch 'file-locks/linux-next'

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

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

diff --cc fs/locks.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc include/linux/fs.h
Simple merge