Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Thomas Gleixner <tglx@linutronix.de>
To:     Linus Torvalds <torvalds@linux-foundation.org>
Cc:     linux-kernel@vger.kernel.org, x86@kernel.org
Subject: Re: [GIT pull] x86/core for v6.5-rc1
In-Reply-To: <CAHk-=wgoVt9izQi2iA3F8PZbnmT+r4CcqaHp+FhEozSj2D=UFg@mail.gmail.com>
References: <168778150975.3634408.5562070824299155127.tglx@vps.praguecc.cz>
 <168778151644.3634408.18311962903658740097.tglx@vps.praguecc.cz>
 <CAHk-=wgoVt9izQi2iA3F8PZbnmT+r4CcqaHp+FhEozSj2D=UFg@mail.gmail.com>
Date:   Tue, 27 Jun 2023 00:18:28 +0200
Message-ID: <87zg4l50ln.ffs@tglx>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Linus!

On Mon, Jun 26 2023 at 15:00, Linus Torvalds wrote:
> On Mon, 26 Jun 2023 at 05:14, Thomas Gleixner <tglx@linutronix.de> 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.

I see you started with x86/boot, which has a similar note. I clearly
missed to add one to smp/core :)

> 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.

That's fine. I do the comment fixup and the preempt_*able() removal in a
follow up.

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

Other than the cosmetic issues you noticed yourself, it's all good.

Thanks,

        tglx