]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jul 2014 22:10:04 +0000 (15:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jul 2014 22:10:04 +0000 (15:10 -0700)
commitbae78dc25993f62194ee53da67b14e3d5007c6c4
treef4a01c8625f086141cccd1b64e994a41cbc6ec85
parentef24209fb21a13aceb8069db609e145789c2f500
parentc3a4561796cffae6996264876ffca147b5c3709a
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfix from Bruce Fields:
 "Another xdr encoding regression that may cause incorrect encoding on
  failures of certain readdirs"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix bad reserving space for encoding rdattr_error