From: Ingo Molnar Date: Tue, 7 Nov 2017 09:51:10 +0000 (+0100) Subject: Merge branch 'linus' into x86/apic, to resolve conflicts X-Git-Tag: v4.15-rc1~149^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=141d3b1daacd11bdbd6fa74c2b163093e10d17ee;p=linux.git Merge branch 'linus' into x86/apic, to resolve conflicts Conflicts: arch/x86/include/asm/x2apic.h Signed-off-by: Ingo Molnar --- 141d3b1daacd11bdbd6fa74c2b163093e10d17ee