diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-31 13:51:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-31 13:51:16 -0700 |
| commit | 3ab4436f688c2d2f221793953cd05435ca84261c (patch) | |
| tree | bdd0e1dd081bdf709d9e9b4cca41fdb0b583f1de /drivers/net/vxlan.c | |
| parent | 41e7231fab9d76e906b6d8abe09c44c7b9656d33 (diff) | |
| parent | 141731d15d6eb2fd9aaefbf9b935ce86ae243074 (diff) | |
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 'drivers/net/vxlan.c')
0 files changed, 0 insertions, 0 deletions