Re: [PATCH v7 01/22] mfd: omap-usb-host: Consolidate OMAP USB-HSplatform data

[Tony Lindgren]

* Roger Quadros <rogerq@xxxxxx> [130211 00:02]:
> On 02/11/2013 08:46 AM, Olof Johansson wrote:
> > On Thu, Jan 17, 2013 at 8:59 AM, Tony Lindgren <tony@xxxxxxxxxxx> wrote:
> >> * Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> [130117 07:19]:
> >>> On Thu, 17 Jan 2013, Roger Quadros wrote:
> >>>
> >>>> Let's have a single platform data structure for the OMAP's High-Speed
> >>>> USB host subsystem instead of having 3 separate ones i.e. one for
> >>>> board data, one for USB Host (UHH) module and one for USB-TLL module.
> >>>>
> >>>> This makes the code much simpler and avoids creating multiple copies of
> >>>> platform data.
> >>>>
> >>>> CC: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> >>>>
> >>>> Signed-off-by: Roger Quadros <rogerq@xxxxxx>
> >>>
> >>> For the ehci-omap.c part:
> >>>
> >>> Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> >>
> >> If Samuel acks this patch, I can apply just this patch alone on v3.8-rc3
> >> into an immutable branch omap-for-v3.9/board-usb so we all merge it in
> >> as needed.
> > 
> > So, that didn't happen; Samuel applied it from the mailing list and
> > sfr just hit merge conflicts due to it.
> > 
> > Sigh.
> > 
> > This patch (touching arch/arm/mach-omap2) didn't have acks from Tony either.
> 
> Oops, this is my bad :(. Should have flagged Samuel about it. Will be more careful
> next time.
> 
> > 
> > Samuel, Tony, can you sort this out with a stable short topic branch
> > as Tony suggested? It'd be nice to avoid the merge conflict by a
> > little coordination here. :(

Let's see if Samuel can still drop these like I suggested in the
merge conflict mail from Stephen.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/