From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Nov 2018 17:19:58 +0000 (-0800)
Subject: Merge tag 'nfs-for-4.20-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=17c2f540863a6c0faa3f0ede3c785d9427bcaf80;p=openwrt%2Fstaging%2Fblogic.git

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

Pull NFS client bugfixes from Trond Myklebust:

 - Fix a NFSv4 state manager deadlock when returning a delegation

 - NFSv4.2 copy do not allocate memory under the lock

 - flexfiles: Use the correct stateid for IO in the tightly coupled case

* tag 'nfs-for-4.20-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  flexfiles: use per-mirror specified stateid for IO
  NFSv4.2 copy do not allocate memory under the lock
  NFSv4: Fix a NFSv4 state manager deadlock
---

17c2f540863a6c0faa3f0ede3c785d9427bcaf80