Messages in this thread | | | Date | Tue, 10 Jul 2012 11:12:35 -0400 (EDT) | From | Alan Stern <> | Subject | Re: 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
| |