From: Dave Hansen <dave.hansen@intel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>,
Borislav Petkov <bp@alien8•de>, Tony Luck <tony.luck@intel•com>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Dave Hansen <dave.hansen@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Qiuxu Zhuo <qiuxu.zhuo@intel•com>
Subject: Re: linux-next: manual merge of the edac tree with the tip tree
Date: Wed, 18 Dec 2024 19:40:02 -0800 [thread overview]
Message-ID: <c474bb94-0d63-47a0-8043-4f77c72bcfce@intel.com> (raw)
In-Reply-To: <20241219140604.3a67bf32@canb.auug.org.au>
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!
prev parent reply other threads:[~2024-12-19 3:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-19 3:06 linux-next: manual merge of the edac tree with the tip tree Stephen Rothwell
2024-12-19 3:40 ` Dave Hansen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c474bb94-0d63-47a0-8043-4f77c72bcfce@intel.com \
--to=dave.hansen@intel$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=qiuxu.zhuo@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
--cc=tony.luck@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox