]> git.ipfire.org Git - thirdparty/linux.git/commit
projects / thirdparty / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 13148e2 7cb1b46)
Merge branch 'linus' into x86/cleanups, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 10 Dec 2024 18:32:36 +0000 (19:32 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 10 Dec 2024 18:33:03 +0000 (19:33 +0100)
commit05453d36a2fcaf1ea49939f8f9a8cd9dcd516159
treecb43431bb6d4dbd428e43680cc070935a2bf6268tree
parent13148e22c151e871c1c00bab519f39cc6f6ea37acommit | diff
parent7cb1b466315004af98f6ba6c2546bb713ca3c237commit | diff
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 <mingo@kernel.org>
Documentation/admin-guide/kernel-parameters.txt diff1 | diff2 | blob | history
arch/x86/kernel/cpu/topology.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository