From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 May 2019 20:51:16 +0000 (-0700)
Subject: Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v5.2-rc3~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3ab4436f688c2d2f221793953cd05435ca84261c;p=linux.git

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"
---

3ab4436f688c2d2f221793953cd05435ca84261c