From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2024 04:47:03 +0000 (+0200)
Subject: Merge tag 'x86_cpu_for_v6.12_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d580d74ea2836edbbd49cd791eb5d0acad7b14aa;p=users%2Fdwmw2%2Flinux.git

Merge tag 'x86_cpu_for_v6.12_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cpuid updates from Borislav Petkov:

 - Add the final conversions to the new Intel VFM CPU model matching
   macros which include the vendor and finally drop the old ones which
   hardcode family 6

* tag 'x86_cpu_for_v6.12_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines
  x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros
  extcon: axp288: Switch to new Intel CPU model defines
  x86/cpu/intel: Replace PAT erratum model/family magic numbers with symbolic IFM references
---

d580d74ea2836edbbd49cd791eb5d0acad7b14aa