]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 941d8fe 3047088)
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)
commitc987dedda7ae83529c1410b5d8e75b74158c3d0f
treebdd0e1dd081bdf709d9e9b4cca41fdb0b583f1detree | snapshot
parent941d8fe8d9dbfceb1e0750279eedb4bdbb495a99commit | diff
parent3047088b77ddcc2b048fe46beeeef6233669ac49commit | 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"
Linux Kernel Source Tree.