Re: [GIT pull] x86/core for v6.5-rc1

[Linus Torvalds]

On Mon, 26 Jun 2023 at 05:14, Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:
>
> This conflicts with smp/core and x86/boot. The recommended ordering of
> merging these three branches is smp/core, x86/boot, x86/core.
>
> The x86/boot and final x86/core merge have both subtle conflicts. I've
> pushed out the following tags:
>
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git merge_smp_core_x86_boot_for_6_5
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git merge_smp_core_x86_boot_x86_core_for_6_5
>
> for your conveniance to check against.

Bah. I read this after I had already done the merges in a different
order, and my result is a bit different from your merges.

All my differences seem to be benign, though. The main one seems to be
that I kept a preempt_disable/preempt_enable pair in
wakeup_secondary_cpu_via_init(), the others seem to be just comments
and declaration ordering changes.

Still, you might want to double-check the end result.

                   Linus