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: <20210329092247.GA6556@arm.com>
Date:   Mon, 29 Mar 2021 10:22:47 +0100
From:   Catalin Marinas <catalin.marinas@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Will Deacon <will@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rich Wiley <rwiley@...dia.com>,
        Vladimir Murzin <vladimir.murzin@....com>
Subject: Re: linux-next: manual merge of the arm64 tree with Linus' tree

On Mon, Mar 29, 2021 at 09:29:40AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/cpucaps.h
> index c40f2490cd7b,9e3ec4dd56d8..000000000000
> --- a/arch/arm64/include/asm/cpucaps.h
> +++ b/arch/arm64/include/asm/cpucaps.h
> @@@ -66,8 -66,8 +66,9 @@@
>   #define ARM64_WORKAROUND_1508412		58
>   #define ARM64_HAS_LDAPR				59
>   #define ARM64_KVM_PROTECTED_MODE		60
>  -#define ARM64_HAS_EPAN				61
>  +#define ARM64_WORKAROUND_NVIDIA_CARMEL_CNP	61
> ++#define ARM64_HAS_EPAN				62
>   
> --#define ARM64_NCAPS				62
> ++#define ARM64_NCAPS				63
>   
>   #endif /* __ASM_CPUCAPS_H */

Thanks Stephen, it looks fine.

-- 
Catalin