diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:37:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:37:29 +0200 |
| commit | ec8f353f5262acff120a0dc83b714d899ee94b7f (patch) | |
| tree | a5eab4c8ced9b7ea467da00aa5166a8c59d813d0 /arch/x86/kernel/acpi/cppc.c | |
| parent | Merge branch 'x86/cpu' into x86/core, to resolve conflicts (diff) | |
| parent | x86/fpu: Drop @perm from guest pseudo FPU container (diff) | |
| download | linux-ec8f353f5262acff120a0dc83b714d899ee94b7f.tar.gz linux-ec8f353f5262acff120a0dc83b714d899ee94b7f.zip | |
Merge branch 'x86/fpu' 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>
Diffstat (limited to 'arch/x86/kernel/acpi/cppc.c')
0 files changed, 0 insertions, 0 deletions