From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Mar 2020 22:21:32 +0000 (-0700)
Subject: Merge tag 'nfs-for-5.6-3' of git://git.linux-nfs.org/projects/anna/linux-nfs
X-Git-Tag: v5.6-rc6~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b0ea262a2347eac8522de5eef24ccd7a90dad7d4;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'nfs-for-5.6-3' of git://git.linux-nfs.org/projects/anna/linux-nfs

Pull NFS client bugfixes from Anna Schumaker:
 "These are mostly fscontext fixes, but there is also one that fixes
  collisions seen in fscache:

   - Ensure the fs_context has the correct fs_type when mounting and
     submounting

   - Fix leaking of ctx->nfs_server.hostname

   - Add minor version to fscache key to prevent collisions"

* tag 'nfs-for-5.6-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  nfs: add minor version to nfs_server_key for fscache
  NFS: Fix leak of ctx->nfs_server.hostname
  NFS: Don't hard-code the fs_type when submounting
  NFS: Ensure the fs_context has the correct fs_type before mounting
---

b0ea262a2347eac8522de5eef24ccd7a90dad7d4