From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Stephen Rothwell <sfr@au1.ibm.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the xen-two tree with the tip tree
Date: Thu, 10 Feb 2011 10:24:57 -0500 [thread overview]
Message-ID: <20110210152457.GB12087@dumpdata.com> (raw)
In-Reply-To: <20110210122423.GC26094@elte.hu>
On Thu, Feb 10, 2011 at 01:24:23PM +0100, Ingo Molnar wrote:
>
> * Thomas Gleixner <tglx@linutronix.de> wrote:
>
> >
> >
> > On Thu, 10 Feb 2011, Stephen Rothwell wrote:
> >
> > > Hi Konrad,
> > >
> > > Today's linux-next merge of the xen-two tree got a conflict in
> > > kernel/irq/manage.c between commit
> > > dc5f219e88294b93009eef946251251ffffb6d60 ("genirq: Add
> > > IRQF_FORCE_RESUME") from the tip tree and commit
> > > c6c5596743c2a333a8e31b0247f44cd367484a5e ("genirq: Add
> > > IRQF_FORCE_RESUME") from the xen-two tree.
> > >
> > > Despite having the same Author time stamps, these commits are not quite the
> > > same. I used the version from the tip tree which kept the line:
> > >
> > > desc->status &= ~IRQ_SUSPENDED;
> >
> > That's the correct one. I fear I messed up, when I gave xen folks the
> > git url to pull from. I had the first version pushed out, and zapped
> > right away when I noticed the missing line. Then fixed it and
> > repushed. I should have checked git://..... which obviously had
> > already picked up the borked one and did not pick up the correct one
> > before xen folks pulled. Sorry about that.
>
> The resolution would be for the Xen tree to pull again and pick the new commit's
> content as the conflict resolution result. That will resolve the linux-next conflict
> as well.
Should be all fixed now.
next prev parent reply other threads:[~2011-02-10 15:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 3:55 linux-next: manual merge of the xen-two tree with the tip tree Stephen Rothwell
2011-02-10 12:22 ` Thomas Gleixner
2011-02-10 12:24 ` Ingo Molnar
2011-02-10 15:24 ` Konrad Rzeszutek Wilk [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-15 6:28 Stephen Rothwell
2011-03-15 13:50 ` Konrad Rzeszutek Wilk
2013-07-03 5:59 Stephen Rothwell
2013-07-03 11:36 ` Konrad Rzeszutek Wilk
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=20110210152457.GB12087@dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@au1.ibm.com \
--cc=tglx@linutronix.de \
/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).