linux-kernel - Re: linux-next: manual merge of the xen-two tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110210122423.GC26094@elte.hu>
Date:	Thu, 10 Feb 2011 13:24:23 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Thomas Gleixner <tglx@...utronix.de>
Cc:	Stephen Rothwell <sfr@....ibm.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: Re: linux-next: manual merge of the xen-two tree with the tip tree


* Thomas Gleixner <tglx@...utronix.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.

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/