From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: linux-next: build failure after merge of the amlogic tree Date: Thu, 09 Jun 2016 15:43:48 -0700 Message-ID: <7hziquc7a3.fsf@baylibre.com> References: <20160606095559.67cf4f00@canb.auug.org.au> <20160606140231.394f5db7@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from mail-pf0-f169.google.com ([209.85.192.169]:36742 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917AbcFIWnu (ORCPT ); Thu, 9 Jun 2016 18:43:50 -0400 Received: by mail-pf0-f169.google.com with SMTP id t190so17017337pfb.3 for ; Thu, 09 Jun 2016 15:43:50 -0700 (PDT) In-Reply-To: <20160606140231.394f5db7@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 6 Jun 2016 14:02:31 +1000") Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, lkml , Neil Armstrong , Philipp Zabel Stephen Rothwell writes: > Hi Kevin, > > On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman 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