Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
Linus Torvalds [Mon, 25 Oct 2010 20:48:29 +0000 (13:48 -0700)]
* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (67 commits)
  SUNRPC: Cleanup duplicate assignment in rpcauth_refreshcred
  nfs: fix unchecked value
  Ask for time_delta during fsinfo probe
  Revalidate caches on lock
  SUNRPC: After calling xprt_release(), we must restart from call_reserve
  NFSv4: Fix up the 'dircount' hint in encode_readdir
  NFSv4: Clean up nfs4_decode_dirent
  NFSv4: nfs4_decode_dirent must clear entry->fattr->valid
  NFSv4: Fix a regression in decode_getfattr
  NFSv4: Fix up decode_attr_filehandle() to handle the case of empty fh pointer
  NFS: Ensure we check all allocation return values in new readdir code
  NFS: Readdir plus in v4
  NFS: introduce generic decode_getattr function
  NFS: check xdr_decode for errors
  NFS: nfs_readdir_filler catch all errors
  NFS: readdir with vmapped pages
  NFS: remove page size checking code
  NFS: decode_dirent should use an xdr_stream
  SUNRPC: Add a helper function xdr_inline_peek
  NFS: remove readdir plus limit
  ...

12 files changed:
1  2 
Documentation/kernel-parameters.txt
fs/nfs/Kconfig
fs/nfs/client.c
fs/nfs/file.c
fs/nfs/nfs4state.c
fs/nfs/super.c
include/linux/nfs_fs.h
include/linux/sunrpc/clnt.h
init/do_mounts.c
net/sunrpc/auth.c
net/sunrpc/clnt.c
net/sunrpc/sched.c

Simple merge
diff --cc fs/nfs/Kconfig
Simple merge
diff --cc fs/nfs/client.c
Simple merge
diff --cc fs/nfs/file.c
Simple merge
Simple merge
diff --cc fs/nfs/super.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge