archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <>
To: "J. Bruce Fields" <>,
	Chuck Lever <>,
	Anna Schumaker <>
Cc: Linux NFS Mailing List <>,
	linux-fsdevel <>,
	Linux Kernel Mailing List <>
Subject: Re: [PULL REQUEST] nfsd changes for 4.15
Date: Sat, 18 Nov 2017 11:40:44 -0800	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Sat, Nov 18, 2017 at 10:40 AM, J. Bruce Fields <> wrote:
> Please pull nfsd changes for 4.15 from:

Hmm. This had a tracepoint conflict with the nfs client pull.

The resolution seems obvious and I did it, but I'd like people to
review the end result but particularly also their workflows, because I
don't think that conflict was reported anywhere and doesn't seem to
exist in next-20171115.

It certainly wasn't mentioned to me in either pull request.

Were the nfs client changes not in next?



  reply	other threads:[~2017-11-18 19:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-18 18:40 [PULL REQUEST] nfsd changes for 4.15 J. Bruce Fields
2017-11-18 19:40 ` Linus Torvalds [this message]
2017-11-19 12:20   ` Stephen Rothwell
2017-11-19 17:03   ` Chuck Lever
2017-11-27 22:12     ` Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).