diff options
| author | Ingo Molnar <[email protected]> | 2024-12-10 18:32:36 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2024-12-10 18:33:03 +0000 |
| commit | 05453d36a2fcaf1ea49939f8f9a8cd9dcd516159 (patch) | |
| tree | cb43431bb6d4dbd428e43680cc070935a2bf6268 /drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | |
| parent | x86/apic: Remove "disablelapic" cmdline option (diff) | |
| parent | Merge tag 'locking_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | kernel-05453d36a2fcaf1ea49939f8f9a8cd9dcd516159.tar.gz kernel-05453d36a2fcaf1ea49939f8f9a8cd9dcd516159.zip | |
Merge branch 'linus' into x86/cleanups, to resolve conflict
These two commits interact:
upstream: 73da582a476e ("x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC")
x86/cleanups: 13148e22c151 ("x86/apic: Remove "disablelapic" cmdline option")
Resolve it.
Conflicts:
arch/x86/kernel/cpu/topology.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c')
0 files changed, 0 insertions, 0 deletions