2019-05-31 20:40:11

by J. Bruce Fields

[permalink] [raw]
Subject: [GIT PULL] nfsd bugfix for 5.2

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(-)


2019-05-31 20:55:24

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] nfsd bugfix for 5.2

The pull request you sent on Fri, 31 May 2019 16:39:44 -0400:

> git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.2-1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3ab4436f688c2d2f221793953cd05435ca84261c

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker