linux-kernel - Re: linux-next: manual merge of the arm64 tree with Linus' 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: <20191028083939.GA10942@iMac-3.local>
Date:   Mon, 28 Oct 2019 08:39:40 +0000
From:   Catalin Marinas <catalin.marinas@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Will Deacon <will@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Marc Zyngier <marc.zyngier@....com>,
        James Morse <james.morse@....com>
Subject: Re: linux-next: manual merge of the arm64 tree with Linus' tree

Hi Stephen,

On Mon, Oct 28, 2019 at 08:39:14AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got conflicts in:
> 
>   arch/arm64/include/asm/cpucaps.h
>   arch/arm64/kernel/cpu_errata.c
> 
> between commits:
> 
>   d3ec3a08fa70 ("arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set")
>   93916beb7014 ("arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT")
>   9405447ef79b ("arm64: Avoid Cavium TX2 erratum 219 when switching TTBR")
> 
> from Linus' tree and commit:
> 
>   05460849c3b5 ("arm64: errata: Hide CTR_EL0.DIC on systems affected by Neoverse-N1 #1542419")
> 
> from the arm64 tree.

Thanks for this. The conflict resolution is correct.

-- 
Catalin