Re: [PULL REQUEST] nfsd changes for 4.15

[Stephen Rothwell]

Hi Linus,

On Sat, 18 Nov 2017 11:40:44 -0800 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> 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?

They were not :-(
-- 
Cheers,
Stephen Rothwell