]> www.infradead.org Git - users/willy/linux.git/commit
Merge remote-tracking branch 'file-locks/locks-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:55:21 +0000 (10:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:55:21 +0000 (10:55 +1100)
commitbec2605edc6fc1cd90d5406f721459406a09bf0d
tree01210a921cfc97dd487e694f2a48bf2c622d4c9a
parent1ec0090ee1f2a5ff409bf2f62a74930b391bd0a2
parent7bbd1fc0e9f1281f9a7122dbfd6641b523c4e4ed
Merge remote-tracking branch 'file-locks/locks-next'
fs/cifs/file.c
fs/nfsd/nfs4state.c
include/linux/fs.h