linux-kernel - 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-next>] [day] [month] [year] [list]

Date:	Wed, 19 Aug 2009 17:59:01 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Robin Getz <rgetz@...ckfin.uclinux.org>,
	Jason Wessel <jason.wessel@...driver.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the usb tree with the tip tree

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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped