From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752748AbcFNQjs (ORCPT ); Tue, 14 Jun 2016 12:39:48 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:33518 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbcFNQjq (ORCPT ); Tue, 14 Jun 2016 12:39:46 -0400 MIME-Version: 1.0 In-Reply-To: <20160615001311.13db4b92@canb.auug.org.au> References: <20160614094019.14fac372@canb.auug.org.au> <20160614143203.220d0722@canb.auug.org.au> <57600036.8040900@suse.cz> <20160615001311.13db4b92@canb.auug.org.au> From: Kees Cook Date: Tue, 14 Jun 2016 09:39:43 -0700 Message-ID: Subject: Re: linux-next: duplicate patches in the kspp and kbuild trees To: Stephen Rothwell Cc: Michal Marek , Linux-Next , LKML , Emese Revfy 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 Tue, Jun 14, 2016 at 7:13 AM, Stephen Rothwell wrote: > Hi Michal, > > On Tue, 14 Jun 2016 15:01:42 +0200 Michal Marek wrote: >> >> I won't :). Kees, are you going to keep the patch in your tree and send >> it to Linus once kbuild is in? Or shall I take it (which would >> temporarily result in another duplication...). > > Or Kees could send you a pull request ... My head hurts. :) How about this: since a pull request would (I think) end up pulling the other unrelated kspp patches, how about you take the patch into kbuild, and once it's there, I'll just remove it from my tree (since it's on top). -Kees -- Kees Cook Chrome OS & Brillo Security