LinuxLists.cc - linux-next: manual merge of the usb tree with the s5p tree

2011-03-11 06:09:24

Subject: linux-next: manual merge of the usb tree with the s5p tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
controlled UDC pullup implementation") from the usb tree.

The latter commit removes the function gta02_udc_command() which is
modified by the former. I removed the function.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:

(No filename) (558.00 B)
(No filename) (490.00 B)
Download all attachments

2011-03-11 06:38:39

by Lars-Peter Clausen

[permalink] [raw]

Subject: Re: linux-next: manual merge of the usb tree with the s5p tree

On 03/11/2011 07:09 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
> S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
> tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
> controlled UDC pullup implementation") from the usb tree.
>
> The latter commit removes the function gta02_udc_command() which is
> modified by the former. I removed the function.
>

Hi

Kukjin could you drop 326d05c15f7f ("ARM: S3C2440: Request usb pullup pin
before using it on GTA02") from your tree? It has been superseded by the other
commit in Gregs tree.

- Lars

2011-03-11 07:19:22

by Kukjin Kim

[permalink] [raw]

Subject: RE: linux-next: manual merge of the usb tree with the s5p tree

Lars-Peter Clausen wrote:
>
> On 03/11/2011 07:09 AM, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
> > S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
> > tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
> > controlled UDC pullup implementation") from the usb tree.
> >
> > The latter commit removes the function gta02_udc_command() which is
> > modified by the former. I removed the function.
> >
>
> Hi
>
> Kukjin could you drop 326d05c15f7f ("ARM: S3C2440: Request usb pullup pin
> before using it on GTA02") from your tree? It has been superseded by the
> other
> commit in Gregs tree.
>
Hi,

Ok, I did it.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.