linux-kernel - Re: linux-next: manual merge of the usb 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: <1250747857.8282.114.camel@twins>
Date:	Thu, 20 Aug 2009 07:57:37 +0200
From:	Peter Zijlstra <peterz@...radead.org>
To:	Greg KH <greg@...ah.com>
Cc:	Jason Wessel <jason.wessel@...driver.com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Robin Getz <rgetz@...ckfin.uclinux.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>
Subject: Re: linux-next: manual merge of the usb tree with the tip tree

On Wed, 2009-08-19 at 19:48 -0700, Greg KH wrote:
> On Wed, Aug 19, 2009 at 09:37:03PM -0500, Jason Wessel wrote:
> > Greg KH wrote:
> > > On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
> > >   
> > >> Hi Greg,
> > >>
> > >> Today's linux-next merge of the usb tree got a conflict in
> > >> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
> > >> ("printk: Enable the use of more than one CON_BOOT (early console)") from
> > >> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
> > >> printk: early_printk,console: Allow more than one early console") from
> > >> the usb tree.
> > >>
> > >> I assume that these are trying to do (more or less) the same thing.  I
> > >> have dropped the one from the usb tree for today.  Please sort this out -
> > >> at least remove the usb tree one until you have done so, thanks.
> > >>     
> > >
> > > Jason, any thoughts?  I'm going to drop your printk stuff from my tree
> > > now, care to sort it out and resend your whole series?
> > >
> > >   
> > 
> > I will investigate, re-test and send a new series to Greg KH later in
> > the week.  The preliminary result shows the problem is a result of a
> > clash with two different patches in the tip tree.   My patch set and the
> > two patches it collides with context wise fix different things.
> > 
> > In order to resolve this it appears that the series will need to get
> > split into something for the tip tree and something for the USB tree, or
> > we wait for the next pull of the tip branch into the Linus's tree.
> 
> Hm, I'd prefer to get this in before that :)
> 
> Let me know what you find.  If there are conflicts, we can work it out.

Maybe Robin can help out, since he authored one of the conflicting
patches? 
--
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/