Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Propagate 'fsc' mount option through automounts sunrpc/rpc_pipe: fix kernel-doc notation sunrpc: xdr_xcode_hyper helpers cannot presume 64-bit alignment NFS: Add nfs_alloc_parsed_mount_data NFS/RPC: fix problems with reestablish_timeout and related code. NFS: Get rid of the NFS_MOUNT_VER3 and NFS_MOUNT_TCP flags
Showing
- fs/nfs/client.c 10 additions, 3 deletionsfs/nfs/client.c
- fs/nfs/fscache.c 21 additions, 4 deletionsfs/nfs/fscache.c
- fs/nfs/fscache.h 4 additions, 2 deletionsfs/nfs/fscache.h
- fs/nfs/super.c 40 additions, 36 deletionsfs/nfs/super.c
- include/linux/sunrpc/xdr.h 3 additions, 2 deletionsinclude/linux/sunrpc/xdr.h
- net/sunrpc/rpc_pipe.c 2 additions, 1 deletionnet/sunrpc/rpc_pipe.c
- net/sunrpc/xprtsock.c 9 additions, 0 deletionsnet/sunrpc/xprtsock.c
Loading
Please register or sign in to comment