Re: [PATCH] usb: host: tegra remove include of <mach/iomap.h>

[Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>]

On Wed, Oct 24, 2012 at 03:44:27PM -0600, Stephen Warren wrote:
> On 10/24/2012 03:37 PM, Greg Kroah-Hartman wrote:
> > On Tue, Oct 02, 2012 at 04:49:25PM -0600, Stephen Warren wrote:
> >> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >>
> >> Almost nothing from this file is used, and the file will hopefully be
> >> deleted soon. Copy the tiny portions that are used directly into
> >> ehci-tegra.c. I believe that Venu Byravarasu is working on cleaning up
> >> our USB driver, and those cleanups will remove the need for these
> >> constants.
> >>
> >> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >> Acked-by: Venu Byravarasu <vbyravarasu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >> ---
> >> Greg, if this patch can get into 3.7 (it's late, I know) at a point before
> >> wherever you branch off your USB tree for 3.8, then that would be great.
> >> If not, may I please request this patch be merged into a separate branch/tag
> >> that is merged into both the Tegra and USB trees for 3.8, since I will
> >> probably have cleanup patches in the Tegra tree that depend on this change,
> >> and Venu will likely be sending patches through the USB tree that will need
> >> to be merged with this too.
> > 
> > I don't know how you want to do this, but this, and the other tegra
> > patch, are now in the usb-next branch of my usb.git tree.
> 
> Aargh! Felipe has already applied the PHY patch to his branch. I believe
> he was also going to apply the EHCI driver patch too.

That's ok, they will merge together just fine.

> Having this just be applied to a next branch rather than a topic branch
> was exactly what I wanted to avoid; it's why I wrote the heads-up above...
> 
> > I would recommend just cherry-picking the thing into your tree if you
> > want to do work on top of it, we can handle merge issues later on in
> > 3.8-rc1.
> 
> If I just cherry-pick the change, then that will cause the same commit
> to exist under different commit IDs in two different trees. Isn't that a
> no-no? That's exactly why I wanted this in a topic branch so we could
> both merge it rather than duplicating it.

This is a 3 line patch, not a big deal either way if it's duplicated.  A
whole different branch isn't really needed, I'm not insane like the arm
development trees, I only have 2 branches :)

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html