LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [GIT PULL] nfsd bugfix for 5.2
@ 2019-05-31 20:39 J. Bruce Fields
  2019-05-31 20:55 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: J. Bruce Fields @ 2019-05-31 20:39 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-nfs, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread
* Re: [GIT PULL] nfsd bugfix for 5.2
  2019-05-31 20:39 [GIT PULL] nfsd bugfix for 5.2 J. Bruce Fields
@ 2019-05-31 20:55 ` pr-tracker-bot
  0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2019-05-31 20:55 UTC (permalink / raw)
  To: J. Bruce Fields; +Cc: Linus Torvalds, linux-nfs, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-31 20:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31 20:39 [GIT PULL] nfsd bugfix for 5.2 J. Bruce Fields
2019-05-31 20:55 ` pr-tracker-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).