linux-next: manual merge of the loongarch tree with the arm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the loongarch tree got a conflict in:

  rust/Makefile

between commit:

  ccb8ce526807 ("ARM: 9441/1: rust: Enable Rust support for ARMv7")

from the arm tree and commit:

  13c23cb4ed09 ("rust: Fix enabling Rust and building with GCC for LoongArch")

from the loongarch tree.

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.

-- 
Cheers,
Stephen Rothwell

diff --cc rust/Makefile
index 7f4b77de833f,2c57c624fe7d..000000000000
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -250,7 -247,7 +251,8 @@@ bindgen_skip_c_flags := -mno-fp-ret-in-
  # Derived from `scripts/Makefile.clang`.
  BINDGEN_TARGET_x86	:= x86_64-linux-gnu
  BINDGEN_TARGET_arm64	:= aarch64-linux-gnu
 +BINDGEN_TARGET_arm	:= arm-linux-gnueabi
+ BINDGEN_TARGET_loongarch	:= loongarch64-linux-gnusf
  BINDGEN_TARGET		:= $(BINDGEN_TARGET_$(SRCARCH))
  
  # All warnings are inhibited since GCC builds are very experimental,

Attachment: pgp3w65rASgw2.pgp
Description: OpenPGP digital signature