From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161398AbcFMXkY (ORCPT ); Mon, 13 Jun 2016 19:40:24 -0400 Received: from ozlabs.org ([103.22.144.67]:40836 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932430AbcFMXkX (ORCPT ); Mon, 13 Jun 2016 19:40:23 -0400 Date: Tue, 14 Jun 2016 09:40:19 +1000 From: Stephen Rothwell To: Kees Cook , Michal Marek Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Emese Revfy Subject: linux-next: duplicate patches in the kspp and kbuild trees Message-ID: <20160614094019.14fac372@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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). -- Cheers, Stephen Rothwell