From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
Chuck Lever <chuck.lever@oracle.com>,
Anna Schumaker <Anna.Schumaker@netapp.com>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PULL REQUEST] nfsd changes for 4.15
Date: Sun, 19 Nov 2017 23:20:37 +1100 [thread overview]
Message-ID: <20171119232037.6a719dec@canb.auug.org.au> (raw)
In-Reply-To: <CA+55aFwPHpD0Ehq8_VawfLCTXgMkbWE3fvdNc__ELmirh1rPVQ@mail.gmail.com>
Hi Linus,
On Sat, 18 Nov 2017 11:40:44 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Sat, Nov 18, 2017 at 10:40 AM, J. Bruce Fields <bfields@fieldses.org> 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?
They were not :-(
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-11-19 12:20 UTC|newest]
Thread overview: 6+ 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
2017-11-19 12:20 ` Stephen Rothwell [this message]
[not found] ` <4fba12c5-b204-9492-cfa8-283af5e87dde@Netapp.com>
[not found] ` <20171201074717.3f6af4ce@canb.auug.org.au>
[not found] ` <10221c9a-4b34-3a83-0fd7-0a4f11699c15@Netapp.com>
2017-12-03 21:38 ` 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171119232037.6a719dec@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Anna.Schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.