From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754073AbbHXIW3 (ORCPT ); Mon, 24 Aug 2015 04:22:29 -0400 Received: from ozlabs.org ([103.22.144.67]:49065 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753807AbbHXIW2 (ORCPT ); Mon, 24 Aug 2015 04:22:28 -0400 Date: Mon, 24 Aug 2015 18:22:25 +1000 From: Stephen Rothwell To: Greg KH , Arnd Bergmann , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Vitaly Kuznetsov , "K. Y. Srinivasan" Subject: linux-next: manual merge of the char-misc tree with the tip tree Message-ID: <20150824182225.76165d7a@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the char-misc tree got a conflict in: arch/x86/kernel/cpu/mshyperv.c 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). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au 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; #endif + 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 = {