From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org, Sheng Yang <sheng.yang@intel•com>,
Avi Kivity <avi@qumranet•com>
Subject: linux-next: manual merge of the sparseirq tree
Date: Tue, 16 Sep 2008 00:58:47 +1000 [thread overview]
Message-ID: <20080916005847.fba3582d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
Hi Ingo,
Today's linux-next merge of the sparseirq tree got a trivial conflict in
arch/x86/kvm/vmx.h and include/asm-x86/msr-index.h between commit
f5dd05a1980ab0770f1889fbc3ad2daa5ff89d6d ("x86: Move FEATURE_CONTROL bits
to msr-index.h") from the kvm tree and commit
315a6558f30a264c88274fa70626615d1c7851c7 ("x86: move VMX MSRs to
msr-index.h") from the sparseirq tree.
Just context changes. I fixed it up and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-09-15 14:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-15 14:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-16 8:08 linux-next: manual merge of the sparseirq tree Stephen Rothwell
2008-10-16 8:13 ` Ingo Molnar
2008-10-16 8:30 ` Stephen Rothwell
2008-09-15 15:19 Stephen Rothwell
2008-09-15 18:35 ` Roland McGrath
2008-09-17 10:20 ` Ingo Molnar
2008-08-25 9:32 Stephen Rothwell
2008-08-25 19:37 ` Jeremy Fitzhardinge
2008-08-25 23:48 ` 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=20080916005847.fba3582d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=avi@qumranet$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sheng.yang@intel$(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