Re: linux-next: manual merge of the ftrace tree with Linus' tree

From: Stephen Rothwell
Date: Wed May 15 2019 - 23:34:27 EST

Hi Steve,

On Wed, 15 May 2019 21:53:05 -0400 Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
> I mentioned this conflict and the entry_64.S one to Linus when
> submitting my pull request. I fixed it up too in my ftrace/conflicts
> branch.

And he has merged your branch now, so all good.

Stephen Rothwell

Attachment: pgpGjwqjMwnB_.pgp
Description: OpenPGP digital signature