Merge 6daf0882 ("Merge tag 'vfs-6.13.ecryptfs.mount.api' of...
Merge 6daf0882 ("Merge tag 'vfs-6.13.ecryptfs.mount.api' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs" ) into android-mainline Steps on the way to 6.13-rc1 Change-Id: I988e7493d220e6e159b0e4c9026029682e053f20 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- fs/ecryptfs/main.c 205 additions, 196 deletionsfs/ecryptfs/main.c
- fs/exportfs/expfs.c 15 additions, 2 deletionsfs/exportfs/expfs.c
- fs/fhandle.c 69 additions, 6 deletionsfs/fhandle.c
- fs/lockd/clntxdr.c 3 additions, 2 deletionsfs/lockd/clntxdr.c
- fs/lockd/svc4proc.c 5 additions, 15 deletionsfs/lockd/svc4proc.c
- fs/lockd/svclock.c 1 addition, 1 deletionfs/lockd/svclock.c
- fs/lockd/svcproc.c 2 additions, 13 deletionsfs/lockd/svcproc.c
- fs/lockd/xdr4.c 0 additions, 2 deletionsfs/lockd/xdr4.c
- fs/nfs_common/nfslocalio.c 3 additions, 5 deletionsfs/nfs_common/nfslocalio.c
- fs/nfsd/export.c 49 additions, 8 deletionsfs/nfsd/export.c
- fs/nfsd/export.h 4 additions, 3 deletionsfs/nfsd/export.h
- fs/nfsd/filecache.c 9 additions, 10 deletionsfs/nfsd/filecache.c
- fs/nfsd/filecache.h 1 addition, 1 deletionfs/nfsd/filecache.h
- fs/nfsd/lockd.c 11 additions, 2 deletionsfs/nfsd/lockd.c
- fs/nfsd/nfs4acl.c 0 additions, 2 deletionsfs/nfsd/nfs4acl.c
- fs/nfsd/nfs4callback.c 101 additions, 38 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4proc.c 93 additions, 10 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4recover.c 2 additions, 1 deletionfs/nfsd/nfs4recover.c
- fs/nfsd/nfs4state.c 82 additions, 45 deletionsfs/nfsd/nfs4state.c
Loading
Please register or sign in to comment