git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 789d7f6 76cb4be)
Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Mar 2015 23:52:50 +0000 (15:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Mar 2015 23:52:50 +0000 (15:52 -0800)
commita6c5170d1edea97c538c81e377e56c7b5c5b7e63
treece04e89597a9266fdf6575424eeb7a85a568c81btree
parent789d7f60cdfdbef510025a2b988bba44cfcc96fecommit | diff
parent76cb4be993c03bf9ec65a58b13f12c679bb041e4commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.