]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2013 16:20:58 +0000 (09:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2013 16:20:58 +0000 (09:20 -0700)
commitd42d23ccf59f2e6f036f5a7d84160ab689fd32c7
tree01d93ad5e1393fe92978dae6ca51459d2afa43c8
parent177ce3c8b9afa7080b4472425914ae9e65d87bae
parentca8b7142bc2e34cc05dc4fff3c2b9d26643795b6
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Some minor fallout from the user-namespace work broke most krb5 mounts
  to nfsd, and I screwed up a change to the AF_LOCAL rpc code."

* 'for-3.9' of git://linux-nfs.org/~bfields/linux:
  sunrpc: don't attempt to cancel unitialized work
  nfsd: fix krb5 handling of anonymous principals