From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Feb 2016 17:36:41 +0000 (-0800)
Subject: Merge tag 'nfs-for-4.5-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v4.5-rc3~18
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=81b676bd87b3e098e06295a6dd523c02e7861e88;p=linux-2.6-block.git

Merge tag 'nfs-for-4.5-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfix and cleanup from Trond Myklebust:
 "Bugfix:
   - pNFS: Fix for missing layoutreturn calls

  Cleanup:
   - pNFS: rename NFS_LAYOUT_RETURN_BEFORE_CLOSE for code clarity"

* tag 'nfs-for-4.5-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Cleanup - rename NFS_LAYOUT_RETURN_BEFORE_CLOSE
  pNFS: Fix missing layoutreturn calls
---

81b676bd87b3e098e06295a6dd523c02e7861e88