]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/urgent' into x86/hyperv
authorThomas Gleixner <tglx@linutronix.de>
Fri, 6 Jul 2018 10:35:56 +0000 (12:35 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 6 Jul 2018 10:35:56 +0000 (12:35 +0200)
commitfcc240912b5c8b47d1dc209fea2e3754c0ed3e5f
treea45cee821404ab0c7f7164e20c2f40f5e34ac16b
parent6d2e8fa2bea9c3186e22735ee85ab442331d7e4c
parent2979e5f2b33b4b032ec7935890474acb75a26ee7
Merge branch 'x86/urgent' into x86/hyperv

Integrate the upstream bug fix to resolve the resulting conflict in
__send_ipi_mask().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/hyperv/hv_apic.c
arch/x86/include/asm/mshyperv.h