Kukjin Kim wrote: > > Stephen Rothwell wrote: > > > > Hi Kukjin, > > > Hi, > > > On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell > <s...@canb.auug.org.au> > > wrote: > > > > > > Today's linux-next merge of the samsung tree got conflicts in > > > many files with the arm-soc tree. > > > > > > I just dropped the samsung tree for today. Please have a look and try to > > > fix this mess up, thanks. > > > > Ping? > > Oops, I missed above e-mail. Anyway, really? > > Let me look at it soon and I will fix. > > Thanks for your information. > Hmm, updating timer patches in Samsung tree cause the merge conflicts with arm-soc, so for now I dropped them in my tree just now. And note that regarding topic branch which are including it will be re-worked soon :-)
Now to merge Samsung tree for linux-next should be fine. Thanks again. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
