From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Aug 2018 17:42:01 +0000 (-0700)
Subject: Merge tag 'nfs-for-4.18-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v4.18-rc8~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=310810ae19480f9fad76b1260eced29356506bac;p=thirdparty%2Fkernel%2Flinux.git

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

Pull NFS client bugfix from Trond Myklebust:
 "Fix a NFSv4 file locking regression"

* tag 'nfs-for-4.18-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Fix _nfs4_do_setlk()
---

310810ae19480f9fad76b1260eced29356506bac