linux-kernel - Re: linux-next: manual merge of the ftrace tree with the arm64 tree

lists.openwall.net		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 linux-hardening linux-cve-announce 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]

Message-ID: <20191115142432.GC32389@arrakis.emea.arm.com>
Date:   Fri, 15 Nov 2019 14:24:33 +0000
From:   Catalin Marinas <catalin.marinas@....com>
To:     Steven Rostedt <rostedt@...dmis.org>
Cc:     Mark Rutland <mark.rutland@....com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Will Deacon <will@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the ftrace tree with the arm64 tree

On Fri, Nov 15, 2019 at 09:21:34AM -0500, Steven Rostedt wrote:
> On Fri, 15 Nov 2019 13:59:24 +0000
> Catalin Marinas <catalin.marinas@....com> wrote:
> 
> > I'm fine sending Linus the pull request with the conflict as long as you
> > and Mark are ok with Stephen's resolution. The only nitpick I have is
> > that the two comments prior to MCOUNT_REC should be merged into a single
> > block (I guess we can leave this to Linus to sort out out).
> 
> Agreed,
> 
> I pushed up the merge conflict resolution to:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/aarch64-conflict
> 
> Feel free to point to that branch as a reference to the conflict
> resolution.

Great. Thanks.

-- 
Catalin