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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECF61C433F5 for ; Wed, 6 Oct 2021 05:46:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3133610A8 for ; Wed, 6 Oct 2021 05:46:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbhJFFsu (ORCPT ); Wed, 6 Oct 2021 01:48:50 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76]:43519 "EHLO gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229797AbhJFFsu (ORCPT ); Wed, 6 Oct 2021 01:48:50 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4HPNkP4mVVz4xb7; Wed, 6 Oct 2021 16:46:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1633499217; bh=b7MTg7ZVl26ADUOl1u03/HcFOduj3s4d9zCKkCxyQXg=; h=Date:From:To:Cc:Subject:From; b=KonA22HM1O/f3gna93O4yr6eX6nqv8hJylacW5fpS3PzXjfJc7x+x/YEr+ReKiGoA dxef7Ha0aWvapsaR/fWVSr0l2KBFXMYryqicZQsTCnjIsYySDOhNYLFoS7n0Fy+B2M 1VBhmfirFiIyPkN6HExAXa7n/w7yZG4w2IbIGhbXzTOnWtIOiatGvvVoVz0RGLfD6w OSNyQzre8ztkGAoJpvuS7IlbG1jmJNO4IfCFuaocWZ4y3+aRc9+1SChdGLOpZDQ5k1 rWz752BE8PTJKzoLLc1/J3Vd++TFJyvlSEksApAWcQbkcOaMVTlETVVd7hK/nAU+5/ VhZFtwdsKVoYg== Date: Wed, 6 Oct 2021 16:46:52 +1100 From: Stephen Rothwell To: Miguel Ojeda , Masahiro Yamada Cc: Adam Bratschi-Kaye , Alex Gaynor , Ayaan Zaidi , Boqun Feng , Boris-Chengbiao Zhou , Douglas Su , Finn Behrens , Fox Chen , Gary Guo , Geoffrey Thomas , Linux Kernel Mailing List , Linux Next Mailing List , Michael Ellerman , Miguel Ojeda , Sumera Priyadarsini , Sven Van Asbroeck , Wedson Almeida Filho , Yuki Okushi Subject: linux-next: manual merge of the rust tree with the kbuild tree Message-ID: <20211006164652.28b82d57@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/J1zoyKkcUK6Ohh+IrncZNnJ"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/J1zoyKkcUK6Ohh+IrncZNnJ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the rust tree got a conflict in: scripts/kconfig/confdata.c between several commits, including 2836b7a7bd05 ("[for -next only] kconfig: generate include/generated/rustc= _cfg") from the kbuild tree and commit: dc08d49444e9 ("Kbuild: add Rust support") from the rust tree. I fixed it up (as per Masahiro Yamada's suggestion, I used the version from the kbuild tree) 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 Cheers, Stephen Rothwell --Sig_/J1zoyKkcUK6Ohh+IrncZNnJ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmFdOEwACgkQAVBC80lX 0GzJmggAoaYZs2dTQJuhAju6k7BhtVxBI+0E/+1Vo43Rzn/38ptZ+MqtM0X0t71S pB6gaGaeQh5FNo2x8Wee8TOLLw6E2fWcLkYyeF39azPekmyHmK+WotvotUSJ04X3 sLH/3Y0KBM7r/b5BhalyPipw96jqiywoTnyBRv6x37D6OTCBLaW1bZhVOIVU+v02 FpL6l9sVr+ukmJP37e8HpBSzdt3KrZJVZpSDMuC4ndICDNf9Hzvu0z4yGhCclOLK 0AwUER0Gu+A7icL6uEApgb1hKqgHla6wDJeVjVgak8QGfW2mbnV+ADJ9VK3RB2D6 f1fwInYdFjeZmTc3frKGn4OBDyNRJQ== =q619 -----END PGP SIGNATURE----- --Sig_/J1zoyKkcUK6Ohh+IrncZNnJ--