From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jan Beulich <JBeulich@novell.com>,
Jason Wessel <jason.wessel@windriver.com>
Subject: linux-next: manual merge of the usb tree with Linus' tree
Date: Wed, 23 Sep 2009 16:38:17 +1000 [thread overview]
Message-ID: <20090923163817.44bcebb8.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 624 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-09-23 6:38 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-23 6:38 Stephen Rothwell [this message]
2009-09-23 12:38 ` linux-next: manual merge of the usb tree with Linus' tree Jason Wessel
2009-09-23 12:50 ` Stephen Rothwell
2009-09-23 13:20 ` Greg KH
2009-12-23 22:30 Stephen Rothwell
2009-12-23 23:38 ` Greg KH
2009-12-24 0:22 ` Stephen Rothwell
[not found] <20100805132208.74bf6ab9.sfr@canb.auug.org.au>
2010-08-05 10:17 ` Jiri Kosina
2010-08-05 10:35 ` Michał Nazarewicz
2010-08-05 22:36 ` Greg KH
2010-12-06 1:47 Stephen Rothwell
2010-12-07 4:43 ` Greg KH
2010-12-07 5:49 ` Felipe Balbi
2010-12-16 3:01 Stephen Rothwell
2010-12-16 3:08 ` Greg KH
2010-12-16 8:05 ` Felipe Balbi
2010-12-16 8:45 ` Felipe Balbi
2010-12-16 15:52 ` Greg KH
2010-12-16 15:55 ` Felipe Balbi
2010-12-16 17:44 ` Greg KH
2010-12-16 18:14 ` Greg KH
2010-12-16 22:33 ` Stephen Rothwell
2011-02-07 4:08 Stephen Rothwell
2011-02-09 2:31 ` Xu, Andiry
2011-02-09 2:31 ` Xu, Andiry
2011-02-09 5:42 ` Xu, Andiry
2011-02-09 5:42 ` Xu, Andiry
2011-02-17 18:04 ` Greg KH
2013-01-21 4:07 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:52 ` Greg KH
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=20090923163817.44bcebb8.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=JBeulich@novell.com \
--cc=greg@kroah.com \
--cc=jason.wessel@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.