Linux kernel bug fix: x86/hyper-v: Fix wrong merge conflict resolution
Subsystem: arch/x86 (arch/x86/hyperv/hv_apic.c)
Bug type: hang, severity: critical
Files changed: arch/x86/hyperv/hv_apic.c
Introduced by Thomas Gleixner on 2018-07-06 12:35:56 +0200; fixed by K. Y. Srinivasan on 2018-07-20 06:56:23 +0200 (lifetime: 13 days)