linux-kernel - linux-next: manual merge of the usb tree with Linus' 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]

Message-Id: <20090923163817.44bcebb8.sfr@canb.auug.org.au>
Date:	Wed, 23 Sep 2009 16:38:17 +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,
	Jan Beulich <JBeulich@...ell.com>,
	Jason Wessel <jason.wessel@...driver.com>
Subject: linux-next: manual merge of the usb tree with Linus' tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/x86/kernel/early_printk.c between commit
414128bd33fef3242747154dfa444970bc5caf4c ("x86: Increase timeout for EHCI
debug port reset completion in early printk") from Linus' tree and commit
bd965307ef6b7a56219f8883d5038f6573a94f6e ("USB: ehci,dbgp,early_printk:
split ehci debug driver from early_printk.c") from the usb tree.

The latter moved the code that the former modified.  A later USB patch
used an even longer loop delay.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped