projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
41e7231
141731d
)
Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 31 May 2019 20:51:16 +0000
(13:51 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 31 May 2019 20:51:16 +0000
(13:51 -0700)
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"
Trivial merge