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 [email protected]
http://www.canb.auug.org.au/~sfr/
Stephen Rothwell wrote:
> 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.
>
>
Please, let me know if there is something I need to do here.
Simply changing the context of the patch in Greg's branch should be
enough. There are many more fixes beyond just the timing loop in the
dbgp series which cover, cold and warm restarts and various errata with
the ehci debug controllers.
Hopefully we can get the dbgp series merged soon because this particular
errata was fixed several months ago. :-)
Thanks,
Jason.
Hi Jason,
On Wed, 23 Sep 2009 07:38:23 -0500 Jason Wessel <[email protected]> wrote:
>
> Please, let me know if there is something I need to do here.
>
> Simply changing the context of the patch in Greg's branch should be
> enough. There are many more fixes beyond just the timing loop in the
> dbgp series which cover, cold and warm restarts and various errata with
> the ehci debug controllers.
Yeah, I think Greg just needs to rebase his series on to a more recent
version of Linus' tree. (and then test and submit it, of course :-))
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Wed, Sep 23, 2009 at 10:50:26PM +1000, Stephen Rothwell wrote:
> Hi Jason,
>
> On Wed, 23 Sep 2009 07:38:23 -0500 Jason Wessel <[email protected]> wrote:
> >
> > Please, let me know if there is something I need to do here.
> >
> > Simply changing the context of the patch in Greg's branch should be
> > enough. There are many more fixes beyond just the timing loop in the
> > dbgp series which cover, cold and warm restarts and various errata with
> > the ehci debug controllers.
>
> Yeah, I think Greg just needs to rebase his series on to a more recent
> version of Linus' tree. (and then test and submit it, of course :-))
It was a simple merge, I've now refreshed my tree with this change
locally, and will push it out in a bit.
thanks,
greg k-h