Re: linux-next: manual merge of the edac tree with the tip tree

[Dave Hansen <dave.hansen@xxxxxxxxx>]

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!