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>

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/x86/kernel/cpu/topology.c
index 6ebed852a9ef7fcca80553414cfcfcf063045937,b2e313ea17bf6f590029ccfea26af52c7f82967d..01456236a6dd340f6fff334a98206d5bf3ed6b3a
--- 1/arch/x86/kernel/cpu/topology.c
--- 2/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@@ -428,8 -428,8 +428,8 @@@ void __init topology_apply_cmdline_limi
  {
        unsigned int possible = nr_cpu_ids;
  
-       /* 'maxcpus=0' 'nosmp' 'nolapic' 'noapic' */
-       if (!setup_max_cpus || ioapic_is_disabled || apic_is_disabled)
 -      /* 'maxcpus=0' 'nosmp' 'nolapic' 'disableapic' */
++      /* 'maxcpus=0' 'nosmp' 'nolapic' */
+       if (!setup_max_cpus || apic_is_disabled)
                possible = 1;
  
        /* 'possible_cpus=N' */