Received-SPF: pass (google.com: domain of linux-kernel+bounces-99617-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 12 Mar 2024 09:35:54 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: Miguel Ojeda <ojeda@kernel.org>, Jamie Cunliffe
 <Jamie.Cunliffe@arm.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the rust tree with the arm64 tree
Message-ID: <20240312093554.757be026@canb.auug.org.au>
In-Reply-To: <20240301153807.796a3a28@canb.auug.org.au>
References: <20240301153807.796a3a28@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Q0Isj19=L7oicB0XWpoYZzw";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Q0Isj19=L7oicB0XWpoYZzw
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 1 Mar 2024 15:38:07 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>=20
>   rust/Makefile
>=20
> between commit:
>=20
>   f82811e22b48 ("rust: Refactor the build target to allow the use of buil=
tin targets")
>=20
> from the arm64 tree and commit:
>=20
>   ecab4115c44c ("kbuild: mark `rustc` (and others) invocations as recursi=
ve")
>=20
> from the rust 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 rust/Makefile
> index fe045dbc701e,a78fcf4004b0..000000000000
> --- a/rust/Makefile
> +++ b/rust/Makefile
> @@@ -435,11 -434,8 +435,11 @@@ $(obj)/core.o: private skip_clippy =3D=20
>   $(obj)/core.o: private skip_flags =3D -Dunreachable_pub
>   $(obj)/core.o: private rustc_objcopy =3D $(foreach sym,$(redirect-intri=
nsics),--redefine-sym $(sym)=3D__rust$(sym))
>   $(obj)/core.o: private rustc_target_flags =3D $(core-cfgs)
>  -$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs scripts/target.json FORCE
>  +$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs FORCE
> - 	$(call if_changed_dep,rustc_library)
> + 	+$(call if_changed_dep,rustc_library)
>  +ifneq ($(or $(CONFIG_X86_64),$(CONFIG_LOONGARCH)),)
>  +$(obj)/core.o: scripts/target.json
>  +endif
>  =20
>   $(obj)/compiler_builtins.o: private rustc_objcopy =3D -w -W '__*'
>   $(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o F=
ORCE

This is now a conflict between the arm64 tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/Q0Isj19=L7oicB0XWpoYZzw
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXvh0oACgkQAVBC80lX
0GwcDwf/bMJz7vItRV2Jj0m6wXuP0h3a74+UhMSDaEXhx4qTGmCCYuldk0HNr0rl
u10DAaf4E7McOQXIZAXUyEm0x9M+0aF9DadaUf1+yV7/Q3Yq+hUp/RyKzWtyBCPe
WTzKeihWYMROHqAR2pksZ/1B3TlYhxXmGiyqoFVaQ4H1dnn7TDxeZf6giK6IHntl
omG2g3mePQsESPSKH0tg2AMWnWtnVNbuDzqReTNTb/b6swgaTyUOlkuRuqYWM6hS
zVh/N+u6vQUHro1Hw/pgktK7iTUMI0CGaQ/rOajt63/CBuH+WS117lUrxOpW4sys
gk/ghPZWOcZcguVdWLXDjIRfwSGmyA==
=lt8A
-----END PGP SIGNATURE-----

--Sig_/Q0Isj19=L7oicB0XWpoYZzw--