Re: [PULL REQUEST] nfsd changes for 4.15

From: Linus Torvalds
Date: Sat Nov 18 2017 - 14:56:41 EST

On Sat, Nov 18, 2017 at 10:40 AM, J. Bruce Fields <bfields@xxxxxxxxxxxx> 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?