lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Thu, 16 May 2019 13:32:30 +1000
From:   Stephen Rothwell <>
To:     Steven Rostedt <>
Cc:     Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Josh Poimboeuf <>,
        "Peter Zijlstra (Intel)" <>,
        Linus Torvalds <>
Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree

Hi Steve,

On Wed, 15 May 2019 21:53:05 -0400 Steven Rostedt <> 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

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists