From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Vitaly Kuznetsov <vkuznets@redhat•com>,
"K. Y. Srinivasan" <kys@microsoft•com>
Subject: linux-next: manual merge of the char-misc tree with the tip tree
Date: Mon, 24 Aug 2015 18:22:25 +1000 [thread overview]
Message-ID: <20150824182225.76165d7a@canb.auug.org.au> (raw)
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 = {
next reply other threads:[~2015-08-24 8:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 8:22 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-02 4:20 linux-next: manual merge of the char-misc tree with the tip tree Stephen Rothwell
2025-09-22 9:56 Mark Brown
2025-09-22 12:04 ` Greg KH
2025-09-22 14:59 ` Boqun Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150824182225.76165d7a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=kys@microsoft$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=vkuznets@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox