Hi, On Fri, 30 Jul 2010 10:57:41 +0900 Kukjin Kim <kgene.kim@xxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpyyxaPpGxVh.pgp
Description: PGP signature
