2024-03-12 16:21:39

by Dave Hansen

Subject: [GIT PULL] x86/apic for 6.9-rc1 (includes a new revert)

Hi Linus,

Please pull an x86/apic revert. The reverted commit is not x86/apic
material and was cruft left over from a merge.

I believe the sequence of events went something like this:

* The commit in question was added to x86/urgent
* x86/urgent was merged into x86/apic to resolve a conflict
* The commit was zapped from x86/urgent, but *not* from x86/apic
* x86/apic got pullled (yesterday)

I think we need to be a bit more vigilant when zapping things to
make sure none of the other branches are depending on the zapped
material.

--

The following changes since commit f0551af021308a2a1163dc63d1f1bba3594208bd:

x86/topology: Ignore non-present APIC IDs in a present package (2024-03-06 14:35:30 +0100)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86-apic-2024-03-12

for you to fetch changes up to 532a0c57d7ff75e8f07d4e25cba4184989e2a241:

Revert "x86/bugs: Use fixed addressing for VERW operand" (2024-03-12 08:33:51 -0700)

----------------------------------------------------------------
* Revert VERW fixed addressing patch

----------------------------------------------------------------
Dave Hansen (1):
Revert "x86/bugs: Use fixed addressing for VERW operand"

arch/x86/include/asm/nospec-branch.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

2024-03-12 17:11:58

by pr-tracker-bot

Subject: Re: [GIT PULL] x86/apic for 6.9-rc1 (includes a new revert)

The pull request you sent on Tue, 12 Mar 2024 09:21:25 -0700:

> https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86-apic-2024-03-12

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e66c58f743513119f703f3a47f0f93a8e82c0028

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html