]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge branch 'x86/platform' into x86/core, to merge dependent commits
authorIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:46:22 +0000 (10:46 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:46:22 +0000 (10:46 +0200)
commit7d40efd67dd313826a12dc4b03635ece97bb6d04
tree08765befd3ce627bdcb6c1fc484132b76c435dfa
parentd6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b
parentab8131028710d009ab93d6bffd2a2749ade909b0
Merge branch 'x86/platform' into x86/core, to merge dependent commits

Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:

  6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/amd.c