]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Oct 2010 16:52:09 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Oct 2010 16:52:09 +0000 (09:52 -0700)
commita4dd8dce14014665862ce7911b38cb2c69e366dd
tree00e79b2845d5d49abcd83cf253db83a52d482265
parentb18cae4224bde7e5a332c19bc99247b2098ea232
parent411b5e05617593efebc06241dbc56f42150f2abe
Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  net/sunrpc: Use static const char arrays
  nfs4: fix channel attribute sanity-checks
  NFSv4.1: Use more sensible names for 'initialize_mountpoint'
  NFSv4.1: pnfs: filelayout: add driver's LAYOUTGET and GETDEVICEINFO infrastructure
  NFSv4.1: pnfs: add LAYOUTGET and GETDEVICEINFO infrastructure
  NFS: client needs to maintain list of inodes with active layouts
  NFS: create and destroy inode's layout cache
  NFSv4.1: pnfs: filelayout: introduce minimal file layout driver
  NFSv4.1: pnfs: full mount/umount infrastructure
  NFS: set layout driver
  NFS: ask for layouttypes during v4 fsinfo call
  NFS: change stateid to be a union
  NFSv4.1: pnfsd, pnfs: protocol level pnfs constants
  SUNRPC: define xdr_decode_opaque_fixed
  NFSD: remove duplicate NFS4_STATEID_SIZE
fs/nfs/Kconfig
fs/nfs/client.c
fs/nfs/file.c
fs/nfs/nfs4state.c
include/linux/nfs_fs.h
net/sunrpc/auth_gss/gss_krb5_mech.c