From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753211AbdFSAXL (ORCPT ); Sun, 18 Jun 2017 20:23:11 -0400 Received: from ozlabs.org ([103.22.144.67]:49967 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752871AbdFSAXJ (ORCPT ); Sun, 18 Jun 2017 20:23:09 -0400 Date: Mon, 19 Jun 2017 10:23:07 +1000 From: Stephen Rothwell To: Kees Cook Cc: Daniel Micay , Linux-Next Mailing List , Linux Kernel Mailing List , Andrew Morton Subject: Re: linux-next: build failure after merge of the kspp tree Message-ID: <20170619102307.32daa88d@canb.auug.org.au> In-Reply-To: <20170616133144.535aa23a@canb.auug.org.au> References: <20170616113032.306720bf@canb.auug.org.au> <1497581467.17727.7.camel@gmail.com> <20170616133144.535aa23a@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 Stephen, On Fri, 16 Jun 2017 13:31:44 +1000 Stephen Rothwell wrote: > > Hi Kees, > > On Thu, 15 Jun 2017 20:20:47 -0700 Kees Cook wrote: > > > > I'm so confused -- isn't this in next? All the build tests I did were > > against yesterday's -next which includes this from what I can see... > > It is in next, but gets merged after the kspp tree ... so, this is when > inter-tree dependencies are a pain - I can merge the kspp tree later, > but then you have to remember which trees Linus must merge before you > send your pull request. That's why we like to have all trees be > effectively stand alone (as much as possible). OK, for now I have moved the merging of the kspp tree to after everything else (except Andrew's quilt series). This will (unfortunately) hide some dependencies between trees. -- Cheers, Stephen Rothwell