Hi Steve,

On Wed, 15 May 2019 21:53:05 -0400 Steven Rostedt <rost...@goodmis.org> 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: pgp3_1jB6zJ6k.pgp
Description: OpenPGP digital signature

Reply via email to