]> Gentwo Git Trees - linux/.git/commit
Merge branch 'linus' into x86/cpu, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 16 Apr 2025 05:03:04 +0000 (07:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 16 Apr 2025 05:03:58 +0000 (07:03 +0200)
commit06e09002bc1d46505d6b3bd947ebaf3cec7acab8
treeda8b8a243b23ed3e5d9d790878924d65bc463b14
parent3aba0b40cacdfba4a604dd09315fa6cdbeb0ed90
parent1a1d569a75f3ab2923cb62daf356d102e4df2b86
Merge branch 'linus' 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/ras/amd/atl/internal.h
tools/arch/x86/include/asm/cpufeatures.h
tools/perf/check-headers.sh