From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422726AbcFMX5T (ORCPT ); Mon, 13 Jun 2016 19:57:19 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36041 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965068AbcFMX5R (ORCPT ); Mon, 13 Jun 2016 19:57:17 -0400 MIME-Version: 1.0 In-Reply-To: References: <20160614094019.14fac372@canb.auug.org.au> From: Kees Cook Date: Mon, 13 Jun 2016 16:57:15 -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 Mon, Jun 13, 2016 at 4:53 PM, Kees Cook wrote: > On Mon, Jun 13, 2016 at 4:40 PM, Stephen Rothwell wrote: >> Hi Kees, >> >> As of today, there are four duplicate patches (different commits) >> in the kspp and kbuild trees. >> >> Shared library support >> GCC plugin infrastructure >> Add Cyclomatic complexity GCC plugin >> Add sancov plugin >> >> are in both trees as different commits :-( They have been in the kbuild >> tree for a couple of days already. One of you should be merging the >> other's branch, or you both should be mergeing a common branch. >> >> Also, Kees, the versions in your tree do not have your Signed-off-by >> (but do have Michal's). > > 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. I've done this merge correctly now and pushed a forced update on the kspp tree. -Kees > > Sorry for the confusion! > > -Kees > > -- > Kees Cook > Chrome OS & Brillo Security -- Kees Cook Chrome OS & Brillo Security