[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CA+55aFwPHpD0Ehq8_VawfLCTXgMkbWE3fvdNc__ELmirh1rPVQ@mail.gmail.com>
Date: Sat, 18 Nov 2017 11:40:44 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: "J. Bruce Fields" <bfields@...ldses.org>,
Chuck Lever <chuck.lever@...cle.com>,
Anna Schumaker <Anna.Schumaker@...app.com>
Cc: Linux NFS Mailing List <linux-nfs@...r.kernel.org>,
linux-fsdevel <linux-fsdevel@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PULL REQUEST] nfsd changes for 4.15
On Sat, Nov 18, 2017 at 10:40 AM, J. Bruce Fields <bfields@...ldses.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?
Tssk.
Linus
Powered by blists - more mailing lists