Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932722AbaLAXGw (ORCPT ); Mon, 1 Dec 2014 18:06:52 -0500 Received: from mail-oi0-f41.google.com ([209.85.218.41]:55713 "EHLO mail-oi0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932484AbaLAXGt (ORCPT ); Mon, 1 Dec 2014 18:06:49 -0500 MIME-Version: 1.0 In-Reply-To: References: <20141125194319.GA9328@www.outflux.net> <20141127084614.209450b9@canb.auug.org.au> Date: Mon, 1 Dec 2014 15:06:48 -0800 X-Google-Sender-Auth: pQTZatUJb23hPiBvLkQAAk2Fx6s Message-ID: Subject: Re: [PULL] seccomp update (next) From: Kees Cook To: James Morris Cc: Stephen Rothwell , linux-security-module , LKML , Pranith Kumar Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? -Kees -- Kees Cook Chrome OS Security -- 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/