Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096

We merge the irq/sparseirq, x86/quirks and x86/reboot trees into the
cpus4096 tree because the io-apic changes in the sparseirq change
conflict with the cpumask changes in the cpumask tree, and we
want to resolve those.

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/process.c
index c27af49a4ede1b525daece26f937b8bfaa6560b5,c622772744d86fcb0dcd3e6c46a6de5323508c40,c622772744d86fcb0dcd3e6c46a6de5323508c40,a4da7c4b31294782fe42143a6dcd07c5203bb137..95d811a9594fda74e35b926fa8ff4777a750e37c
--- 1/arch/x86/kernel/process.c
--- 2/arch/x86/kernel/process.c
--- 3/arch/x86/kernel/process.c
--- 4/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@@@ -7,8 -7,7 -7,7 -7,8 +7,9 @@@@@
    #include <linux/module.h>
    #include <linux/pm.h>
    #include <linux/clockchips.h>
 +++#include <linux/ftrace.h>
    #include <asm/system.h>
+++ #include <asm/apic.h>
    
    unsigned long idle_halt;
    EXPORT_SYMBOL(idle_halt);

diff --cc arch/x86/kernel/reboot.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc init/main.c
Simple merge