linux-next: manual merge of the rust tree with the kbuild tree

Hi all, Today's linux-next merge of the rust tree got a conflict in: Makefile between commit: b0600f0d9b54 ("kbuild: check the minimum assembler version in Kconfig") from the kbuild tree and commit: 98898dfbdf72 ("Rust support") from the rust tree. I fixed it up (see below) and can

Re: linux-next: manual merge of the rust tree with the kbuild tree

On Thu, Mar 18, 2021 at 5:37 AM Stephen Rothwell wrote: > > I fixed it up (see below - I think I got this right ...) 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

linux-next: manual merge of the rust tree with the kbuild tree

Hi all, Today's linux-next merge of the rust tree got a conflict in: Makefile between commits: a14efe0d73eb ("kbuild: include Makefile.compiler only when compiler is needed") 9fc2872b700a ("Makefile: Remove '--gcc-toolchain' flag") 71eb5c859a59 ("Makefile: Only specify '--prefix='