The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Dave Hansen <dave.hansen@linux.intel.com>
To: torvalds@linux-foundation.org
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	Dave Hansen <dave.hansen@linux.intel.com>
Subject: [GIT PULL] x86/apic for 6.9-rc1 (includes a new revert)
Date: Tue, 12 Mar 2024 09:21:25 -0700	[thread overview]
Message-ID: <20240312162125.136813-1-dave.hansen@linux.intel.com> (raw)

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(-)

             reply	other threads:[~2024-03-12 16:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-12 16:21 Dave Hansen [this message]
2024-03-12 17:11 ` [GIT PULL] x86/apic for 6.9-rc1 (includes a new revert) pr-tracker-bot

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=20240312162125.136813-1-dave.hansen@linux.intel.com \
    --to=dave.hansen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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