From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Mar 2018 17:47:03 +0000 (-0700)
Subject: Merge tag 'nfs-for-4.16-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v5.4.17~6461
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fc6eabbbf8ef99efed778dd5afabc83c21dba585;p=arm%2Flinux.git

Merge tag 'nfs-for-4.16-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust:
 "Hightlights include the following stable fixes:

   - NFS: Fix an incorrect type in struct nfs_direct_req

   - pNFS: Prevent the layout header refcount going to zero in
     pnfs_roc()

   - NFS: Fix unstable write completion"

* tag 'nfs-for-4.16-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Fix unstable write completion
  pNFS: Prevent the layout header refcount going to zero in pnfs_roc()
  NFS: Fix an incorrect type in struct nfs_direct_req
---

fc6eabbbf8ef99efed778dd5afabc83c21dba585