• Linus Torvalds's avatar
    Merge tag 'x86-apic-2024-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e66c58f7
    Linus Torvalds authored
    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"
    e66c58f7
nospec-branch.h 16.1 KB