From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Feb 2018 21:43:18 +0000 (-0800)
Subject: Merge tag 'nfs-for-4.16-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: microblaze-4.17-rc1~109
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=c89be5242607d8aa08a6fa45a887c68b2d4a2a2c;p=linux-2.6-microblaze.git

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

Pull NFS client bugfixes from Trond Myklebust:

 - fix a broken cast in nfs4_callback_recallany()

 - fix an Oops during NFSv4 migration events

 - make struct nlmclnt_fl_close_lock_ops static

* tag 'nfs-for-4.16-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: make struct nlmclnt_fl_close_lock_ops static
  nfs: system crashes after NFS4ERR_MOVED recovery
  NFSv4: Fix broken cast in nfs4_callback_recallany()
---

c89be5242607d8aa08a6fa45a887c68b2d4a2a2c