lkml.org 
[lkml]   [2012]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRE: linux-next: manual merge of the s5p tree with the arm tree
Date
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
> Today's linux-next merge of the s5p tree got a lot of conflicts caused by
> duplicates of commits in your tree and Russell's. It looks like you have
> merged a version of Russell's tree and then it has been rebased and added
> to. You need to fix up your tree with respect to Russell's.
>
Oops, yeah. I will remove Russell's old tree in my next and sorry for
bothering.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.



\
 
 \ /
  Last update: 2012-01-05 03:37    [W:0.050 / U:0.332 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site