From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Lars-Peter Clausen' <lars@metafoo•de>,
'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: 'Greg KH' <greg@kroah•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: RE: linux-next: manual merge of the usb tree with the s5p tree
Date: Fri, 11 Mar 2011 16:19:09 +0900 [thread overview]
Message-ID: <010b01cbdfbc$a3052460$e90f6d20$%kim@samsung.com> (raw)
In-Reply-To: <4D79C3AC.7090900@metafoo.de>
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 <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2011-03-11 7:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-11 6:09 linux-next: manual merge of the usb tree with the s5p tree Stephen Rothwell
2011-03-11 6:39 ` Lars-Peter Clausen
2011-03-11 7:19 ` Kukjin Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-04-14 4:15 Stephen Rothwell
2011-04-14 4:52 ` Greg KH
2012-05-14 7:47 Stephen Rothwell
2012-05-14 14:28 ` Greg KH
2012-05-16 8:03 Stephen Rothwell
2012-05-16 12:06 ` Greg KH
2012-05-18 7:22 Stephen Rothwell
2012-05-18 15:21 ` Greg KH
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='010b01cbdfbc$a3052460$e90f6d20$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=lars@metafoo$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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