From: Hollis Blanchard <hollisb@us.ibm.com>
To: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Avi Kivity <avi@qumranet.com>,
linux-next@vger.kernel.org,
Kumar Gala <galak@kernel.crashing.org>
Subject: Re: linux-next: manual merge of the kvm tree
Date: Mon, 22 Dec 2008 16:44:13 -0600 [thread overview]
Message-ID: <1229985853.7181.10.camel@localhost.localdomain> (raw)
In-Reply-To: <18768.5298.173232.227168@cargo.ozlabs.ibm.com>
On Tue, 2008-12-23 at 09:29 +1100, Paul Mackerras wrote:
> Hollis Blanchard writes:
>
> > > Patch is in Paulus -next already so we'll have to do a manual resolve.
> >
> > Who has to do it? My code should "win".
>
> Do you have your own tree or is all your stuff in the main kvm tree?
>
> If there is a powerpc KVM tree, I could pull that and resolve the
> conflict, but I don't want to pull all the queued up KVM stuff.
It's just the main KVM tree.
> Worst case is Linus gets to resolve the conflict in the merge window.
> If that's just a matter of him taking your version of the file, it
> should be within his powers to manage. :)
Yeah, that's what I meant by "win"... whatever changes Ben made are to
now-dead code, so the code in kvm.git should be used. Does Linus need
special instruction to do this, or how does that work?
--
Hollis Blanchard
IBM Linux Technology Center
next prev parent reply other threads:[~2008-12-22 22:44 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-22 3:52 linux-next: manual merge of the kvm tree 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 [this message]
2008-12-23 0:07 ` Paul Mackerras
2008-12-23 1:02 ` Hollis Blanchard
2008-12-23 1:38 ` Benjamin Herrenschmidt
-- 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-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-15 0:14 Stephen Rothwell
2008-09-15 6:53 ` Ingo Molnar
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=1229985853.7181.10.camel@localhost.localdomain \
--to=hollisb@us.ibm.com \
--cc=avi@qumranet.com \
--cc=benh@kernel.crashing.org \
--cc=galak@kernel.crashing.org \
--cc=linux-next@vger.kernel.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).