Merge tag 'nfsd-4.3-2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Oct 2015 18:31:03 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Oct 2015 18:31:03 +0000 (11:31 -0700)
commit5b5f1455272e23f4e7889cec37228802d8d01adf
treebaee6044c8936bf7a9ddbb524f9d31bafb81da19
parent6006d4521b158e5ef48620e8c9028bba91bf985d
parent3be7f32878e742cf3c17b435c90e198862457706
Merge tag 'nfsd-4.3-2' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Two nfsd fixes, one for an RDMA crash, one for a pnfs/block protocol
  bug"

* tag 'nfsd-4.3-2' of git://linux-nfs.org/~bfields/linux:
  svcrdma: Fix NFS server crash triggered by 1MB NFS WRITE
  nfsd/blocklayout: accept any minlength