From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751598AbcFFECg (ORCPT ); Mon, 6 Jun 2016 00:02:36 -0400 Received: from ozlabs.org ([103.22.144.67]:56903 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750743AbcFFECe (ORCPT ); Mon, 6 Jun 2016 00:02:34 -0400 Date: Mon, 6 Jun 2016 14:02:31 +1000 From: Stephen Rothwell To: Kevin Hilman Cc: linux-next@vger.kernel.org, lkml , Neil Armstrong , Philipp Zabel Subject: Re: linux-next: build failure after merge of the amlogic tree Message-ID: <20160606140231.394f5db7@canb.auug.org.au> In-Reply-To: References: <20160606095559.67cf4f00@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. It also means that your for-next branch, on its own, will get this build failure as well ... -- Cheers, Stephen Rothwell