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@xxxxxxxxxxx>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
