]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge tag 'v6.15-rc5' into x86/cpu, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 6 May 2025 07:59:02 +0000 (09:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 6 May 2025 08:00:58 +0000 (10:00 +0200)
commit24035886d735e4ce1c4605638adafe1fa2988e7a
tree8c75625bc848a16bde8ce69e902c70c28e7d3da7
parent3aba0b40cacdfba4a604dd09315fa6cdbeb0ed90
parent92a09c47464d040866cf2b4cd052bc60555185fb
Merge tag 'v6.15-rc5' into x86/cpu, to resolve conflicts

 Conflicts:
tools/arch/x86/include/asm/cpufeatures.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
MAINTAINERS
arch/x86/include/asm/nospec-branch.h
arch/x86/kernel/cpu/bugs.c
drivers/platform/x86/amd/pmc/pmc.c
drivers/platform/x86/amd/pmf/core.c
drivers/ras/amd/atl/internal.h
sound/soc/amd/acp/acp-rembrandt.c
sound/soc/amd/acp/acp63.c
sound/soc/amd/acp/acp70.c
tools/arch/x86/include/asm/cpufeatures.h
tools/perf/check-headers.sh