projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 41e7231 141731d)
Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 May 2019 20:51:16 +0000 (13:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 May 2019 20:51:16 +0000 (13:51 -0700)
commit3ab4436f688c2d2f221793953cd05435ca84261c
treebdd0e1dd081bdf709d9e9b4cca41fdb0b583f1detree | snapshot
parent41e7231fab9d76e906b6d8abe09c44c7b9656d33commit | diff
parent141731d15d6eb2fd9aaefbf9b935ce86ae243074commit | 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"
John Crispins staging tree