From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: 'Erik Gilling' <konkers@android.com>,
'Colin Cross' <ccross@android.com>,
'Olof Johansson' <olof@lixom.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
'Changhwan Youn' <chaos.youn@samsung.com>
Subject: Re: linux-next: manual merge of the tegra tree with the s5p tree
Date: Fri, 30 Jul 2010 14:03:31 +1000 [thread overview]
Message-ID: <20100730140331.04c60f73.sfr@canb.auug.org.au> (raw)
In-Reply-To: <015801cb2f8a$9bca9b90$d35fd2b0$%kim@samsung.com>
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
Hi,
On Fri, 30 Jul 2010 10:57:41 +0900 Kukjin Kim <kgene.kim@samsung.com> wrote:
>
> If there is some conflicts, how can/should I do for it...
> Stephen, please let me know.
In this case, do nothing :-) The conflicts will get fixed up when either
Russell or Linus merges your tree into theirs. My email was more of a
"heads up" to let you know that there is some conflict.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
prev parent reply other threads:[~2010-07-30 4:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-30 0:58 linux-next: manual merge of the tegra tree with the s5p tree Stephen Rothwell
2010-07-30 1:57 ` Kukjin Kim
2010-07-30 4:03 ` Stephen Rothwell [this message]
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=20100730140331.04c60f73.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ccross@android.com \
--cc=chaos.youn@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=konkers@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
/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