diff options
| author | Linus Torvalds <[email protected]> | 2019-05-31 20:51:16 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-05-31 20:51:16 +0000 |
| commit | 3ab4436f688c2d2f221793953cd05435ca84261c (patch) | |
| tree | bdd0e1dd081bdf709d9e9b4cca41fdb0b583f1de /fs/proc/array.c | |
| parent | Merge tag 'v5.2-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | Revert "lockd: Show pid of lockd for remote locks" (diff) | |
| download | kernel-3ab4436f688c2d2f221793953cd05435ca84261c.tar.gz kernel-3ab4436f688c2d2f221793953cd05435ca84261c.zip | |
Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux
Pull nfsd fix from Bruce Fields:
"This reverts a minor fix which could cause us to treat conflicting NLM
locks as nonconflicting.
We have proper fix queued up for 5.3. In the meantime, a quick revert
seems best for 5.2 and stable"
* tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux:
Revert "lockd: Show pid of lockd for remote locks"
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions