From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757919AbcGZWTi (ORCPT ); Tue, 26 Jul 2016 18:19:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:52860 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756073AbcGZWTe (ORCPT ); Tue, 26 Jul 2016 18:19:34 -0400 Subject: Re: linux-next: duplicate patches in the kspp and kbuild trees To: Kees Cook , Stephen Rothwell References: <20160614094019.14fac372@canb.auug.org.au> <20160614143203.220d0722@canb.auug.org.au> <57600036.8040900@suse.cz> <20160615001311.13db4b92@canb.auug.org.au> Cc: Linux-Next , LKML , Emese Revfy From: Michal Marek Message-ID: <5797E1EA.8070605@suse.cz> Date: Wed, 27 Jul 2016 00:19:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dne 14.6.2016 v 18:39 Kees Cook napsal(a): > 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). Sorry, I forgot about this one. It's cherry-picked onto my kbuild branch now. Michal