| author | Thomas Gleixner <tglx@linutronix.de> | |
| Fri, 6 Jul 2018 10:35:56 +0000 (12:35 +0200) | ||
| committer | Thomas Gleixner <tglx@linutronix.de> | |
| Fri, 6 Jul 2018 10:35:56 +0000 (12:35 +0200) | ||
| commit | 8f63e9230decb06ea9068feaf0845c0eb39ab890 | |
| tree | a45cee821404ab0c7f7164e20c2f40f5e34ac16b | tree | snapshot (tar.xz tar.gz zip) |
| parent | 58ec5e9c9044bd7e1c0bcc6ad822b2e909f49732 | commit | diff |
| parent | 1268ed0c474a5c8f165ef386f3310521b5e00e27 | commit | diff |
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>
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 | diff1 | | diff2 | | blob | history |
| arch/x86/include/asm/mshyperv.h | diff1 | | diff2 | | blob | history |