OSDN Git Service

Merge 'x86/urgent' into x86/cpu
authorBorislav Petkov <bp@suse.de>
Thu, 7 May 2020 10:27:43 +0000 (12:27 +0200)
committerBorislav Petkov <bp@suse.de>
Thu, 7 May 2020 10:27:43 +0000 (12:27 +0200)
commit51485635ebc25267ebab548a1bce43f823d9c0c5
tree152408c7f8959f6871b655d9193a76b529faa4bb
parente9d7144597b10ff13ff2264c059f7d4a7fbc89ac
parentfb9cbbc895eb6e986dc90c928a35c793d75f435a
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>