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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37259EE4993 for ; Tue, 22 Aug 2023 12:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235671AbjHVMVK (ORCPT ); Tue, 22 Aug 2023 08:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235527AbjHVMVK (ORCPT ); Tue, 22 Aug 2023 08:21:10 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57AD6CD9; Tue, 22 Aug 2023 05:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692706848; bh=pU/Gx4YtZaDBwDUNfI1IoL0eeX0Rd8fwiRWuqoSHKjc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=oFBiE4dNJKdOG4oBrU6z/i+u2GNyRg7OpeGU8/x2GWlkgFhj7GJHx1BTVCa87EQpM H7PDtQ7T3F5m9eoxyQahMkxD6NA2jInYqbI0l1vKN0pY/OPAvOjLv2Dy/wWSLR6Lo/ m3QXIbNnfVe4tyQvapA3dM+gaV8UktMVoOCWzvnoHYZz7ZfeEo4cpOPXxEm31euL1P hwTehIvnII1wKtt2H6uGslg4mIdgMErTCO41eT/qU46YRmKdOvs681hSSrmqxBMVYu l7mN3PpywjQX3GeVS22/EKzetqpoehex+XpIbO3KEAPLtWtLnoT0TUbMVXsDvOGJ8I NJCzqzT41+YKA== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RVT2l5086z4wxR; Tue, 22 Aug 2023 22:20:47 +1000 (AEST) Date: Tue, 22 Aug 2023 22:20:36 +1000 From: Stephen Rothwell To: Miguel Ojeda Cc: Miguel Ojeda , Shuah Khan , Brendan Higgins , Benno Lossin , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the rust tree with the kunit-next tree Message-ID: <20230822222036.3462aa57@canb.auug.org.au> In-Reply-To: References: <20230822162333.752217fa@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HY7Ty=JOM3t9udWP3GUyVVj"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/HY7Ty=JOM3t9udWP3GUyVVj Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi Miguel, On Tue, 22 Aug 2023 10:15:44 +0200 Miguel Ojeda wrote: > > On Tue, Aug 22, 2023 at 8:23=E2=80=AFAM Stephen Rothwell wrote: > > > > Today's linux-next merge of the rust tree got a conflict in: =20 >=20 > Yeah, we expected this one when we applied an extra patch series > yesterday. I tested the merged trees to double-check the (now tested) > examples pass (i.e. the KUnit tree has a patch series which enables > the testing of the examples in the documentation of Rust code). >=20 > > - /// # use kernel::{macros::pin_data, pin_init}; > > -/// # use kernel::pin_init; > > -/// # use macros::{Zeroable, pin_data}; > > ++/// # use kernel::{macros::Zeroable, pin_data, pin_init}; =20 >=20 > Almost right :) It should be: >=20 > /// # use kernel::{macros::{Zeroable, pin_data}, pin_init}; >=20 > In case it helps for future similar conflicts, the reason is that > there are 3 things we are "using" here: >=20 > kernel::macros::Zeroable > kernel::macros::pin_data > kernel::pin_init >=20 > Instead, the current resolution would mean: >=20 > kernel::macros::Zeroable > kernel::pin_data > kernel::pin_init Thanks for the explanation. I have updated my resolution for tomorrow. --=20 Cheers, Stephen Rothwell --Sig_/HY7Ty=JOM3t9udWP3GUyVVj Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTkqBUACgkQAVBC80lX 0GzCQwf/W6SeDwVHRkawLfuC2UGSxkkKYvhAG69LVvdvXZZTHU1RES8CIVDgYAfB j+dfy3LEIs/LnugmtwTCOiCpSiyG5ptg9ymrPAlIgi4WzLgJpjkbwUjDP3RNCS/p ipCEmwq82M0uIFTM172WHML2Mt+/Xj2Qw79JJ7X6UClS1cN8YZ0HfF8OboqTZX3l J5nueZMcBW2UPhkX+ltyYMQC6bRojkxfkZ2u7S3JA6NZ0hGuNrOP6DKnTGuTI6bN 7d52yDpGvPmfiHhGjUIVHbIESBwr0EZ7THzhmmcuVw/09uHTAdXGEZfNmcC+xKyR drVNkXFHYvDQlUzYuiOReDjxfx9ZGQ== =6ejh -----END PGP SIGNATURE----- --Sig_/HY7Ty=JOM3t9udWP3GUyVVj--