lkml.org 
[lkml]   [2016]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: build failure after merge of the amlogic tree
Date
Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Kevin,
>
> On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@baylibre.com> wrote:
>>
>> Not forgotten, but merged through Philip's reset tree, which I thought
>> was already in linux-next. Sorry about that.
>
> It may well be, but we dislike implicit dependencies between trees ...
> it makes the merge order matter :-( What you should have is a common
> non-rebasing branch that both trees merge.

Yup, I'll work this out with Philipp.

Kevin

\
 
 \ /
  Last update: 2016-06-10 01:21    [W:0.042 / U:1.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site