linux-next: manual merge of the char-misc tree with the tip tree

From: Stephen Rothwell
Date: Mon Aug 24 2015 - 04:22:32 EST

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:


between commit:

88c9281a9fba ("x86/hyperv: Mark the Hyper-V TSC as unstable")

from the tip tree and commit:

2517281d63a2 ("Drivers: hv: vmbus: add special kexec handler")

from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/kernel/cpu/mshyperv.c
index 6fd023d7492d,f794bfa3c138..000000000000
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@@ -141,7 -186,8 +186,10 @@@ static void __init ms_hyperv_init_platf
no_timer_check = 1;

+ mark_tsc_unstable("running on Hyper-V");
+ machine_ops.shutdown = hv_machine_shutdown;
+ machine_ops.crash_shutdown = hv_machine_crash_shutdown;

const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at