| commit | f953d2481e1db0265c5ed69489570377d91d92e6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 10 13:01:51 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 10 13:01:51 2017 -0700 |
| tree | a6e890db57bb3beec0590409e1b39c6a2d45e357 | |
| parent | 7056964a85031f42e2360617b14272593729ce1b [diff] | |
| parent | ec572b9e81b1df79147c2e6f69458e65cf248598 [diff] |
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