]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Sep 2010 00:04:48 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Sep 2010 00:04:48 +0000 (17:04 -0700)
commitde8d4f5d758786a2cbcfa54a6a85ce747e5637e3
treea09c0a4f8fe995bea2dde0ea4fa5dbdd32cf3fd4
parent75e1c70fc31490ef8a373ea2a4bea2524099b478
parent827e3457022d0bb0b1bb8a0eb88501876fe7dcf0
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