diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-10 13:01:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-10 13:01:51 -0700 |
| commit | f953d2481e1db0265c5ed69489570377d91d92e6 (patch) | |
| tree | a6e890db57bb3beec0590409e1b39c6a2d45e357 /kernel | |
| parent | Merge tag 'f2fs-for-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs (diff) | |
| parent | nfsd4: define nfsd4_secinfo_no_name_release() (diff) | |
| download | linux-dev-f953d2481e1db0265c5ed69489570377d91d92e6.tar.xz linux-dev-f953d2481e1db0265c5ed69489570377d91d92e6.zip | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions