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

Stephen Rothwell
2010-07-30T04:03:36Z

[-- 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 --]