]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Oct 2014 20:32:06 +0000 (13:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Oct 2014 20:32:06 +0000 (13:32 -0700)
commit748240e6e73e690063cce30b6c3852059e26fa52
tree0557dab127d1650294565f824466ff6032dbb876
parentd8551f9dbefcb9eb474f9a02fa2a63433b903d1c
parent9df9630222dec3a2061a4137006ef5238f99454d
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux

Pull two nfsd fixes from Bruce Fields:
 "One regression from the 3.16 xdr rewrite, one an older bug exposed by
  a separate bug in the client's new SEEK code"

* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix crash on unknown operation number
  nfsd4: fix response size estimation for OP_SEQUENCE