From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Nov 2010 02:46:28 +0000 (-0800)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: firefly_0821_release~7613^2~3414
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1d6636502b23a964f4e5aac5237d1bbb76a9f912;p=firefly-linux-kernel-4.4.55.git

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: Ignore kmemleak false positive in nfs_readdir_make_qstr
  SUNRPC: Simplify rpc_alloc_iostats by removing pointless local variable
  nfs: trivial: remove unused nfs_wait_event macro
  NFS: readdir shouldn't read beyond the reply returned by the server
  NFS: Fix a couple of regressions in readdir.
  Revert "NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR"
  Regression: fix mounting NFS when NFSv3 support is not compiled
  NLM: Fix a regression in lockd
---

1d6636502b23a964f4e5aac5237d1bbb76a9f912