Please pull: git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.2-1 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. --b. Benjamin Coddington (1): Revert "lockd: Show pid of lockd for remote locks" fs/lockd/xdr.c | 4 ++-- fs/lockd/xdr4.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)