From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Oct 2017 20:01:51 +0000 (-0700)
Subject: Merge tag 'nfsd-4.14-1' of git://linux-nfs.org/~bfields/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f953d2481e1db0265c5ed69489570377d91d92e6;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'nfsd-4.14-1' of git://linux-nfs.org/~bfields/linux

Pull nfsd fix from Bruce Fields:
 "One fix for a 4.14 regression, and one minor fix to the MAINTAINERs
  file. (I was weirdly flattered by the idea that lots of random people
  suddenly seemed to think Jeff and I were VFS experts. Turns out it was
  just a typo)"

* tag 'nfsd-4.14-1' of git://linux-nfs.org/~bfields/linux:
  nfsd4: define nfsd4_secinfo_no_name_release()
  MAINTAINERS: associate linux/fs.h with VFS instead of file locking
---

f953d2481e1db0265c5ed69489570377d91d92e6