From: Tony Lindgren <tony@atomide.com>
To: Roger Quadros <rogerq@ti.com>
Cc: Olof Johansson <olof@lixom.net>,
Alan Stern <stern@rowland.harvard.edu>,
balbi@ti.com, sameo@linux.intel.com, kishon@ti.com,
sshtylyov@mvista.com, bjorn@mork.no, linux@arm.linux.org.uk,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v7 01/22] mfd: omap-usb-host: Consolidate OMAP USB-HS platform data
Date: Mon, 11 Feb 2013 11:02:06 -0800 [thread overview]
Message-ID: <20130211190205.GT4801@atomide.com> (raw)
In-Reply-To: <5118A4BC.2020003@ti.com>
* Roger Quadros <rogerq@ti.com> [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@atomide.com> wrote:
> >> * Alan Stern <stern@rowland.harvard.edu> [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@rowland.harvard.edu>
> >>>>
> >>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
> >>>
> >>> For the ehci-omap.c part:
> >>>
> >>> Acked-by: Alan Stern <stern@rowland.harvard.edu>
> >>
> >> 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
next prev parent reply other threads:[~2013-02-11 19:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-17 11:30 [PATCH v7 00/22] OMAP USB Host cleanup Roger Quadros
2013-01-17 11:30 ` [PATCH v7 01/22] mfd: omap-usb-host: Consolidate OMAP USB-HS platform data Roger Quadros
2013-01-17 15:16 ` Alan Stern
2013-01-17 16:59 ` Tony Lindgren
2013-01-18 9:45 ` Roger Quadros
2013-02-11 6:46 ` Olof Johansson
2013-02-11 7:58 ` Roger Quadros
2013-02-11 19:02 ` Tony Lindgren [this message]
2013-01-17 11:30 ` [PATCH v7 02/22] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
2013-01-17 11:30 ` [PATCH v7 03/22] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2013-01-17 11:30 ` [PATCH v7 04/22] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2013-01-17 11:30 ` [PATCH v7 05/22] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2013-01-17 11:30 ` [PATCH v7 06/22] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2013-01-17 11:30 ` [PATCH v7 07/22] mfd: omap-usb-tll: Fix error message Roger Quadros
2013-01-17 11:30 ` [PATCH v7 08/22] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2013-01-17 11:30 ` [PATCH v7 09/22] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support Roger Quadros
2013-01-17 11:30 ` [PATCH v7 10/22] mfd: omap_usb_host: Avoid missing platform data checks in suspend/resume Roger Quadros
2013-01-17 11:30 ` [PATCH v7 11/22] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap() Roger Quadros
2013-01-17 11:30 ` [PATCH v7 12/22] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2013-01-17 11:30 ` [PATCH v7 13/22] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2013-01-17 11:30 ` [PATCH v7 14/22] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2013-01-17 11:44 ` Felipe Balbi
2013-01-17 12:07 ` Roger Quadros
2013-01-17 11:30 ` [PATCH v7 15/22] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2013-01-17 11:45 ` Felipe Balbi
2013-01-17 12:10 ` Roger Quadros
2013-01-17 12:27 ` Felipe Balbi
2013-01-17 12:45 ` Roger Quadros
2013-01-17 12:48 ` Felipe Balbi
2013-01-17 11:30 ` [PATCH v7 16/22] mfd: omap-usb-host: Get rid of unnecessary spinlock Roger Quadros
2013-01-17 11:30 ` [PATCH v7 17/22] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2013-01-17 11:48 ` Felipe Balbi
2013-01-17 12:13 ` Roger Quadros
2013-01-17 11:30 ` [PATCH v7 18/22] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2013-01-17 11:48 ` Felipe Balbi
2013-01-17 12:46 ` Roger Quadros
2013-01-17 15:15 ` Alan Stern
2013-01-17 11:30 ` [PATCH v7 19/22] ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies Roger Quadros
2013-01-17 17:03 ` Tony Lindgren
2013-01-17 19:00 ` Paul Walmsley
2013-01-17 21:00 ` Felipe Balbi
2013-01-17 22:29 ` Paul Walmsley
2013-01-17 22:31 ` Tony Lindgren
2013-01-17 22:38 ` Paul Walmsley
2013-01-17 22:32 ` Felipe Balbi
2013-01-17 11:30 ` [PATCH v7 20/22] ARM: OMAP4: clock data: get rid of unused USB host clock aliases Roger Quadros
2013-01-17 11:30 ` [PATCH v7 21/22] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2013-01-17 11:30 ` [PATCH v7 22/22] mdf: omap-usb-host: get rid of build warning Roger Quadros
2013-01-17 11:50 ` Felipe Balbi
2013-01-17 13:30 ` Roger Quadros
2013-01-17 11:52 ` [PATCH v7 00/22] OMAP USB Host cleanup Felipe Balbi
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=20130211190205.GT4801@atomide.com \
--to=tony@atomide.com \
--cc=balbi@ti.com \
--cc=bjorn@mork.no \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=rogerq@ti.com \
--cc=sameo@linux.intel.com \
--cc=sshtylyov@mvista.com \
--cc=stern@rowland.harvard.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox