From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Aug 2013 18:15:03 +0000 (-0700)
Subject: Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.11-rc4~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83aaf3b39c4f26d71a58f84924b6c6f9b1070d54;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull nfsd bugfixes from Bruce Fields:
 "Most of this is due to a screwup on my part -- some gss-proxy crashes
  got fixed before the merge window but somehow never made it out of a
  temporary git repo on my laptop...."

* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
  svcrpc: set cr_gss_mech from gss-proxy as well as legacy upcall
  svcrpc: fix kfree oops in gss-proxy code
  svcrpc: fix gss-proxy xdr decoding oops
  svcrpc: fix gss_rpc_upcall create error
  NFSD/sunrpc: avoid deadlock on TCP connection due to memory pressure.
---

83aaf3b39c4f26d71a58f84924b6c6f9b1070d54