From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Mar 2015 23:52:50 +0000 (-0800)
Subject: Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.0-rc3~24
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=a6c5170d1edea97c538c81e377e56c7b5c5b7e63

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

Pull nfsd fixes from Bruce Fields:
 "Three miscellaneous bugfixes, most importantly the clp->cl_revoked
  bug, which we've seen several reports of people hitting"

* 'for-4.0' of git://linux-nfs.org/~bfields/linux:
  sunrpc: integer underflow in rsc_parse()
  nfsd: fix clp->cl_revoked list deletion causing softlock in nfsd
  svcrpc: fix memory leak in gssp_accept_sec_context_upcall
---

a6c5170d1edea97c538c81e377e56c7b5c5b7e63