From: Borislav Petkov Date: Thu, 7 May 2020 10:27:43 +0000 (+0200) Subject: Merge 'x86/urgent' into x86/cpu X-Git-Tag: v5.15~3776^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51485635ebc25267ebab548a1bce43f823d9c0c5;p=platform%2Fkernel%2Flinux-starfive.git Merge 'x86/urgent' into x86/cpu ... to resolve conflicting changes to arch/x86/kernel/apic/apic.c Signed-off-by: Borislav Petkov --- 51485635ebc25267ebab548a1bce43f823d9c0c5