Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933133AbaLBH4c (ORCPT ); Tue, 2 Dec 2014 02:56:32 -0500 Received: from tundra.namei.org ([65.99.196.166]:51378 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932259AbaLBH4a (ORCPT ); Tue, 2 Dec 2014 02:56:30 -0500 Date: Tue, 2 Dec 2014 18:56:15 +1100 (AEDT) From: James Morris To: Kees Cook cc: Stephen Rothwell , linux-security-module , LKML , Pranith Kumar Subject: Re: [PULL] seccomp update (next) In-Reply-To: Message-ID: References: <20141125194319.GA9328@www.outflux.net> <20141127084614.209450b9@canb.auug.org.au> User-Agent: Alpine 2.11 (LRH 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 1 Dec 2014, Kees Cook wrote: > On Mon, Dec 1, 2014 at 2:56 PM, James Morris wrote: > > On Mon, 1 Dec 2014, Kees Cook wrote: > > > >> On Thu, Nov 27, 2014 at 3:37 PM, James Morris wrote: > >> > On Wed, 26 Nov 2014, Kees Cook wrote: > >> > > >> >> > That would be because your tree is based on v3.17 and Kees' is based on > >> >> > v3.18-rc6 ... > >> >> > >> >> James, I can base on whatever you like. I can do v3.17, or even > >> >> against your security-next. It seems everyone uses something > >> >> different. :) > >> > > >> > It's best to track my next branch as your upstream. > >> > >> It'll trigger collisions with what's the x86 -next from luto's > >> changes. Should I just let Stephen sort that out? > > > > Yep. > > Hm, it depends on 54ef6df3f3f1353d99c80c437259d317b2cd1cbd, so basing > against security-next would make the tree unbuildable. Perhaps I > should just wait for -rc1 to land first? Yep, that will work. -- James Morris -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/