From: Borislav Petkov <bp@suse.de>
Date: Thu, 7 May 2020 10:27:43 +0000 (+0200)
Subject: Merge 'x86/urgent' into x86/cpu
X-Git-Tag: ceph-for-5.8-rc2~221^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51485635ebc25267ebab548a1bce43f823d9c0c5;p=ceph-client.git

Merge 'x86/urgent' into x86/cpu

... to resolve conflicting changes to arch/x86/kernel/apic/apic.c

Signed-off-by: Borislav Petkov <bp@suse.de>
---

51485635ebc25267ebab548a1bce43f823d9c0c5