From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Sep 2010 00:04:48 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: firefly_0821_release~9833^2~517
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de8d4f5d758786a2cbcfa54a6a85ce747e5637e3;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:
  SUNRPC: Fix the NFSv4 and RPCSEC_GSS Kconfig dependencies
  statfs() gives ESTALE error
  NFS: Fix a typo in nfs_sockaddr_match_ipaddr6
  sunrpc: increase MAX_HASHTABLE_BITS to 14
  gss:spkm3 miss returning error to caller when import security context
  gss:krb5 miss returning error to caller when import security context
  Remove incorrect do_vfs_lock message
  SUNRPC: cleanup state-machine ordering
  SUNRPC: Fix a race in rpc_info_open
  SUNRPC: Fix race corrupting rpc upcall
  Fix null dereference in call_allocate
---

de8d4f5d758786a2cbcfa54a6a85ce747e5637e3