Merge tag 'nfs-for-4.18-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Aug 2018 17:42:01 +0000 (10:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Aug 2018 17:42:01 +0000 (10:42 -0700)
commit310810ae19480f9fad76b1260eced29356506bac
treea2c2a46c3b361c4d81d098911f159e0636c57045
parent2ed7533cb7d657410ac29adf08d608b634e58eb0
parent6ea76bf51339506e9fb00d6caebf5d6b42a571e3
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()