diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-05-06 09:59:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 10:00:58 +0200 |
| commit | 24035886d735e4ce1c4605638adafe1fa2988e7a (patch) | |
| tree | 8c75625bc848a16bde8ce69e902c70c28e7d3da7 /include/uapi/linux/android/ssh:/git@git.zx2c4.com | |
| parent | x86/cpufeatures: Shorten X86_FEATURE_AMD_HETEROGENEOUS_CORES (diff) | |
| parent | Linux 6.15-rc5 (diff) | |
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>
Diffstat (limited to 'include/uapi/linux/android/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions