Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
backmerge to do fixup of iov_iter_kvec() conflict
No related branches found
No related tags found
Showing
- fs/nfs/delegation.c 9 additions, 8 deletionsfs/nfs/delegation.c
- fs/nfs/dir.c 162 additions, 133 deletionsfs/nfs/dir.c
- fs/nfs/filelayout/filelayout.c 1 addition, 0 deletionsfs/nfs/filelayout/filelayout.c
- fs/nfs/flexfilelayout/flexfilelayout.c 1 addition, 0 deletionsfs/nfs/flexfilelayout/flexfilelayout.c
- fs/nfs/flexfilelayout/flexfilelayoutdev.c 1 addition, 1 deletionfs/nfs/flexfilelayout/flexfilelayoutdev.c
- fs/nfs/inode.c 28 additions, 42 deletionsfs/nfs/inode.c
- fs/nfs/nfs3proc.c 5 additions, 0 deletionsfs/nfs/nfs3proc.c
- fs/nfs/nfs3xdr.c 8 additions, 2 deletionsfs/nfs/nfs3xdr.c
- fs/nfs/nfs4_fs.h 2 additions, 1 deletionfs/nfs/nfs4_fs.h
- fs/nfs/nfs4client.c 9 additions, 7 deletionsfs/nfs/nfs4client.c
- fs/nfs/nfs4proc.c 40 additions, 13 deletionsfs/nfs/nfs4proc.c
- fs/nfs/nfs4state.c 136 additions, 118 deletionsfs/nfs/nfs4state.c
- fs/nfs/nfs4xdr.c 1 addition, 1 deletionfs/nfs/nfs4xdr.c
- fs/nfs/pagelist.c 23 additions, 26 deletionsfs/nfs/pagelist.c
- fs/nfs/pnfs.c 13 additions, 3 deletionsfs/nfs/pnfs.c
- fs/nfs/pnfs.h 1 addition, 0 deletionsfs/nfs/pnfs.h
- fs/nfs/read.c 4 additions, 6 deletionsfs/nfs/read.c
- include/linux/nfs_fs.h 2 additions, 0 deletionsinclude/linux/nfs_fs.h
- include/linux/nfs_fs_sb.h 3 additions, 0 deletionsinclude/linux/nfs_fs_sb.h
- include/linux/nfs_xdr.h 19 additions, 9 deletionsinclude/linux/nfs_xdr.h
Loading
Please register or sign in to comment