[lkml]   [2012]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: build failure after merge of the s5p tree
On Tue, Jan 03, 2012 at 08:20:20AM -0800, Linus Torvalds wrote:
> On Tue, Jan 3, 2012 at 12:12 AM, Kukjin Kim <> wrote:
> >
> > OK, I see. Firstly, I will rebase my for-next as per your suggestion. As you
> > know, I just wanted to avoid known conflicts with driver-core tree.
> Please, in general you should *not* rebase on top of other peoples
> trees either. What's the conflict and why do you need that other tree
> in the first place?

There's lots of merge conflicts with the driver-next tree due to some
changes we made there. We'll work them out before they get pushed to
your tree.


greg k-h

 \ /
  Last update: 2012-01-03 17:31    [W:0.042 / U:32.844 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site