linux-kernel - Re: linux-next: manual merge of the edac tree with the tip 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: <c474bb94-0d63-47a0-8043-4f77c72bcfce@intel.com>
Date: Wed, 18 Dec 2024 19:40:02 -0800
From: Dave Hansen <dave.hansen@...el.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 Mauro Carvalho Chehab <mchehab+samsung@...nel.org>,
 Borislav Petkov <bp@...en8.de>, Tony Luck <tony.luck@...el.com>,
 Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>
Cc: Dave Hansen <dave.hansen@...ux.intel.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Qiuxu Zhuo <qiuxu.zhuo@...el.com>
Subject: Re: linux-next: manual merge of the edac tree with the tip tree

On 12/18/24 19:06, Stephen Rothwell wrote:
>  +	X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &spr_cfg),
>  +	X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,  &spr_cfg),
>  +	X86_MATCH_VFM(INTEL_GRANITERAPIDS_X,  &gnr_cfg),
>  +	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, &gnr_cfg),
>  +	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT,   &gnr_cfg),
> ++	X86_MATCH_VFM(INTEL_ATOM_DARKMONT_X,  &gnr_cfg),
>   	{}
>   };

The merge looks correct to me. Thanks, Stephen!