Linus Torvalds writes: (Summary) This had a tracepoint conflict with the nfs client pull. 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.
exist in next-20171115.
It certainly wasn't mentioned to me in either pull request. Were the nfs client changes not in next?
Were the nfs client changes not in next?
Tssk.
Tssk.
Linus
Linus
Linus
exist in next-20171115.
It certainly wasn't mentioned to me in either pull request. Were the nfs client changes not in next?
Were the nfs client changes not in next?
Tssk.
Tssk.
Linus
Linus
Linus