From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752589AbcFNNBv (ORCPT ); Tue, 14 Jun 2016 09:01:51 -0400 Received: from mx2.suse.de ([195.135.220.15]:60120 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751346AbcFNNBu (ORCPT ); Tue, 14 Jun 2016 09:01:50 -0400 Subject: Re: linux-next: duplicate patches in the kspp and kbuild trees To: Stephen Rothwell , Kees Cook References: <20160614094019.14fac372@canb.auug.org.au> <20160614143203.220d0722@canb.auug.org.au> Cc: Linux-Next , LKML , Emese Revfy From: Michal Marek Message-ID: <57600036.8040900@suse.cz> Date: Tue, 14 Jun 2016 15:01:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <20160614143203.220d0722@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016-06-14 06:32, Stephen Rothwell wrote: > Hi Kees, > > On Mon, 13 Jun 2016 16:57:15 -0700 Kees Cook wrote: >> >> On Mon, Jun 13, 2016 at 4:53 PM, Kees Cook wrote: >>> >>> Strange, I pulled these directly from linux-next. Michal had an >>> auto-responder saying he was going to be out-of-office, so I wanted to >>> make sure the !COMPILE_TEST fix got in. >>> >>> Sounds like I should merge the kbuild tree, rather than cherry-picking >>> from linux-next? I will adjust. > > Cherry-picking produces new commits (with new SHA1s etc), while merging > (or rebasing on top of the other versions) will have the same commits > (not just patches). > > Having the same commits means that they never produce conflicts after > further changes to the same files (unless both sides of the merge make > further changes to the same files). > >> I've done this merge correctly now and pushed a forced update on the kspp tree. > > Thanks for that. Now you just have to hope that Michal never rebases > that part of his tree from under you. (Michal: hint! :-)) 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...). Thanks, Michal