diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-12 09:45:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-12 09:45:34 -0700 |
| commit | e66c58f743513119f703f3a47f0f93a8e82c0028 (patch) | |
| tree | 0b8b40835b16002511bf18a127fd47079220dd42 /arch/x86/Kconfig | |
| parent | Merge tag 'rfds-for-linus-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | Revert "x86/bugs: Use fixed addressing for VERW operand" (diff) | |
| download | wireguard-linux-e66c58f743513119f703f3a47f0f93a8e82c0028.tar.xz wireguard-linux-e66c58f743513119f703f3a47f0f93a8e82c0028.zip | |
Merge tag 'x86-apic-2024-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 APIC fixup from Dave Hansen:
"Revert VERW fixed addressing patch.
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"
* tag 'x86-apic-2024-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "x86/bugs: Use fixed addressing for VERW operand"
Diffstat (limited to 'arch/x86/Kconfig')
0 files changed, 0 insertions, 0 deletions