From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Aug 2010 21:24:41 +0000 (-0700)
Subject: Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.36-rc1~496
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0d9f9e122c74583de15a86d1c660c08dc298f2c8;p=~shefty%2Frdma-dev.git

Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: (34 commits)
  nfsd4: fix file open accounting for RDWR opens
  nfsd: don't allow setting maxblksize after svc created
  nfsd: initialize nfsd versions before creating svc
  net: sunrpc: removed duplicated #include
  nfsd41: Fix a crash when a callback is retried
  nfsd: fix startup/shutdown order bug
  nfsd: minor nfsd read api cleanup
  gcc-4.6: nfsd: fix initialized but not read warnings
  nfsd4: share file descriptors between stateid's
  nfsd4: fix openmode checking on IO using lock stateid
  nfsd4: miscellaneous process_open2 cleanup
  nfsd4: don't pretend to support write delegations
  nfsd: bypass readahead cache when have struct file
  nfsd: minor nfsd_svc() cleanup
  nfsd: move more into nfsd_startup()
  nfsd: just keep single lockd reference for nfsd
  nfsd: clean up nfsd_create_serv error handling
  nfsd: fix error handling in __write_ports_addxprt
  nfsd: fix error handling when starting nfsd with rpcbind down
  nfsd4: fix v4 state shutdown error paths
  ...
---

0d9f9e122c74583de15a86d1c660c08dc298f2c8