From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54722C43615 for ; Wed, 15 Aug 2018 23:56:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 611DA214ED for ; Wed, 15 Aug 2018 23:56:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="hILwc7we" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 611DA214ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729359AbeHPCvB (ORCPT ); Wed, 15 Aug 2018 22:51:01 -0400 Received: from ozlabs.org ([203.11.71.1]:36357 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727420AbeHPCvB (ORCPT ); Wed, 15 Aug 2018 22:51:01 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 41rRFS60HXz9s9J; Thu, 16 Aug 2018 09:56:28 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1534377388; bh=lynnJSaY/z5qdHj0cPVMZKH0/O4JFnW+lR+5eSMyzTs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hILwc7wekAa7SmADTFHT/wz0D4YrbqCrmiqLeb0Ax+sf4NI7WKJrqYYx2IArUtiNc mUVpSzP6fHOjAM7bE6c+P+qKhmcuQnfdWckA00ceLLWBxBzKfj65/0ohG0AJOvExy3 BbkT3r27G/A5Wwu0rXJpIgMNAC7d1R1+e6CxZRzmqPcxfpvly64BSGbf4zWpd6R6se 8ZWvKXmMLvw9H4fb4XWBe1gusjbz3Xk33DOcpt4KgJAm1xjzurLguukul2ag1K6ebS 1vLrH5rWo1VZiGiAhEHTSykxEHUs9zt+Rm+5PjUsBScwcXtMDNDI5LaZOjF6ypugmR lTU8s5eNxbqbA== Date: Thu, 16 Aug 2018 09:56:28 +1000 From: Stephen Rothwell To: Kees Cook Cc: Masahiro Yamada , Linux-Next Mailing List , Linux Kernel Mailing List , Randy Dunlap Subject: Re: linux-next: manual merge of the kspp tree with the kbuild tree Message-ID: <20180816095628.686cba3a@canb.auug.org.au> In-Reply-To: <20180803173020.6ec4014b@canb.auug.org.au> References: <20180803173020.6ec4014b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/A=wnYojCbZVTeGc27ID+O6Z"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/A=wnYojCbZVTeGc27ID+O6Z Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Fri, 3 Aug 2018 17:30:20 +1000 Stephen Rothwell w= rote: > > Today's linux-next merge of the kspp tree got a conflict in: >=20 > arch/Kconfig >=20 > between commit: >=20 > 22471e1313f2 ("kconfig: use a menu in arch/Kconfig to reduce clutter") >=20 > from the kbuild tree and commit: >=20 > 45332b1bdfdc ("gcc-plugins: split out Kconfig entries to scripts/gcc-pl= ugins/Kconfig") >=20 > from the kspp tree. >=20 > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. >=20 > --=20 > Cheers, > Stephen Rothwell >=20 > diff --cc arch/Kconfig > index 6cf1b17a8df2,43f315b84c8f..000000000000 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@@ -984,4 -836,4 +847,6 @@@ config REFCOUNT_FUL > =20 > source "kernel/gcov/Kconfig" > =20 > + source "scripts/gcc-plugins/Kconfig" > ++ > +endmenu This is now a conflict between Linus' tree and the kspp tree. --=20 Cheers, Stephen Rothwell --Sig_/A=wnYojCbZVTeGc27ID+O6Z Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlt0vawACgkQAVBC80lX 0Gx3IggAlbLsi8+1ZYrdn3zGhq2NR0DV1BsbfqtUiB6NrzzDSlerpUei8Toc+lDJ +h45As2mcjQtIMsmabx/UkmFNji03FpyXJz4Flr4F7UYpueYBxThL+R3S9CyHyFt Nylpk8Tskg/JuPyuFDepfWOKM6yX2yMI8bEZVwy68JKWZYdBZNcFJp9Ouki03rie OSfJ4hjtsdrkw0rDoOVW3MJNCHMu7RhKOjiAsZ/ua9H4oEtIiBa6Cg9O10Crk6Fg xa97yhtMZGJvLcsMOxcsj8AWzoNBLSbfwfKjcsyCFJoIcD+UR7ONM7meq0N1Cdeq qhMDtG6m02posVE2DIdcfX1u+dPQzg== =lEyr -----END PGP SIGNATURE----- --Sig_/A=wnYojCbZVTeGc27ID+O6Z--