[U-Boot] [PATCH 7/8] tegra: usb: move implementation into right directory

Tom Warren TWarren at nvidia.com
Tue Oct 30 17:11:04 CET 2012


Simon, et al,

> -----Original Message-----
> From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
> Sent: Tuesday, October 30, 2012 6:34 AM
> To: Lucas Stach
> Cc: Marek Vasut; u-boot at lists.denx.de; Stephen Warren; Tom Warren
> Subject: Re: [PATCH 7/8] tegra: usb: move implementation into right
> directory
> 
> Hi Lucas,
> 
> On Tue, Oct 30, 2012 at 2:22 AM, Lucas Stach <dev at lynxeye.de> wrote:
> > This moves the Tegra USB implementation into the drivers/usb/host
> > directory.
> >
> > Signed-off-by: Lucas Stach <dev at lynxeye.de>
> > ---
> >  arch/arm/cpu/armv7/tegra20/Makefile                |  2 -
> >  .../tegra20/usb.c => drivers/usb/host/ehci-tegra.c | 60
> > ++++++++++++++++++++--
> >  2 Dateien geändert, 55 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-)
> > rename arch/arm/cpu/armv7/tegra20/usb.c =>
> > drivers/usb/host/ehci-tegra.c (92%)
> 
> For me this patch did not apply:
> 
> Applying: tegra: usb: move implementation into right directory
> error: drivers/usb/host/ehci-tegra.c: already exists in index Patch failed
> at 0007 tegra: usb: move implementation into right directory When you have
> resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
> 
> I tried master and tegra/master.
Please apply/develop all Tegra patches on tegra/next. That's where I'll be applying new patches as they come in. /master is usually behind /next until a pull request occurs (which just happens to be what the state is now, so master == next, but that's not the norm).

Thanks,

Tom
> 
> Regards,
> Simon
-- 
nvpublic



More information about the U-Boot mailing list