From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Avi Kivity <avi@qumranet•com>,
linux-next@vger•kernel.org, Sheng Yang <sheng.yang@intel•com>,
Vegard Nossum <vegard.nossum@gmail•com>
Subject: Re: linux-next: manual merge of the kvm tree
Date: Mon, 15 Sep 2008 08:53:16 +0200 [thread overview]
Message-ID: <20080915065316.GF15680@elte.hu> (raw)
In-Reply-To: <20080915101407.2e45a509.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Avi,
>
> Today's linux-next merge of the kvm tree got a trivial conflict in
> include/asm-x86/msr-index.h between commit
> 77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
> guards") from the x86 tree and commit
> 370ad813e210ac91935c6b5fa2e9cf80a0305fad ("x86: Move VMX MSRs to
> msr-index.h") from the kvm tree.
these changes will likely be driven from the KVM tree, so it should not
go beyond this initial conflict. (commit 77ef50a is already interwoven)
> I fixed it up (see below) and can carry the fixup.
thanks!
Ingo
next prev parent reply other threads:[~2008-09-15 6:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-15 0:14 linux-next: manual merge of the kvm tree Stephen Rothwell
2008-09-15 6:53 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-12 2:57 Stephen Rothwell
2009-06-12 7:19 ` Avi Kivity
2009-01-02 0:44 Stephen Rothwell
2008-12-29 5:11 Stephen Rothwell
2008-12-22 3:52 Stephen Rothwell
2008-12-22 5:13 ` Benjamin Herrenschmidt
2008-12-22 21:39 ` Hollis Blanchard
2008-12-22 21:41 ` Benjamin Herrenschmidt
2008-12-22 22:03 ` Hollis Blanchard
2008-12-22 22:11 ` Benjamin Herrenschmidt
2008-12-22 22:29 ` Paul Mackerras
2008-12-22 22:44 ` Hollis Blanchard
2008-12-23 0:07 ` Paul Mackerras
2008-12-23 1:02 ` Hollis Blanchard
2008-12-23 1:38 ` Benjamin Herrenschmidt
2008-11-25 6:49 Stephen Rothwell
2008-10-29 2:58 Stephen Rothwell
2008-10-29 9:55 ` Avi Kivity
2008-10-29 10:35 ` Stephen Rothwell
2008-10-15 5:27 Stephen Rothwell
2008-09-17 5:50 Stephen Rothwell
2008-09-17 5:24 Stephen Rothwell
2008-09-12 19:50 Stephen Rothwell
2008-09-12 19:53 ` Arjan van de Ven
2008-09-12 19:59 ` Stephen Rothwell
2008-08-26 4:45 Stephen Rothwell
2008-08-26 7:39 ` Avi Kivity
2008-08-26 7:41 ` Stephen Rothwell
2008-08-15 4:46 Stephen Rothwell
2008-08-04 3:13 Stephen Rothwell
2008-07-22 3:43 Stephen Rothwell
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=20080915065316.GF15680@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=avi@qumranet$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sheng.yang@intel$(echo .)com \
--cc=vegard.nossum@gmail$(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