lkml.org 
[lkml]   [2012]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the usb tree with the mfd tree
On Tue, 10 Jul 2012, Stephen Rothwell wrote:

> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-omap.c between commit 2761a6394516 ("mfd: USB: Fix
> the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and
> commit 1a49e2ac9651 ("EHCI: centralize controller initialization") from
> the usb tree.
>
> I am not sure how to fix this up, I have just effectively reverted the
> effect of the former commit on this file.

That agrees with Greg's decision. Russ's patch (commit 2761a6) should
be rebased on top of 1a49e2.

Thanks,

Alan Stern



\
 
 \ /
  Last update: 2012-07-10 18:01    [W:0.023 / U:0.652 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site