Subject: linux-next: manual merge of the rust tree with the bpf-next tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 18 Oct 2021 15:51:13 +1100

Hi all,

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

  scripts/Makefile.modfinal

between commit:

  0e32dfc80bae ("bpf: Enable TCP congestion control kfunc from modules")

from the bpf-next tree and commit:

  c862c7fee526 ("Kbuild: add Rust support")

from the rust 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 scripts/Makefile.modfinal
index 1fb45b011e4b,c0842e999a75..000000000000
--- a/scripts/Makefile.modfinal
+++ b/scripts/Makefile.modfinal
@@@ -39,11 -39,12 +39,13 @@@ quiet_cmd_ld_ko_o = LD [M]  $
  
  quiet_cmd_btf_ko = BTF [M] $@
        cmd_btf_ko = 							\
- 	if [ -f vmlinux ]; then						\
+ 	if [ ! -f vmlinux ]; then					\
+ 		printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \
+ 	elif $(srctree)/scripts/is_rust_module.sh $@; then 		\
+ 		printf "Skipping BTF generation for %s because it's a Rust module\n" $@ 1>&2; \
+ 	else								\
  		LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J --btf_base vmlinux $@; \
 +		$(RESOLVE_BTFIDS) -b vmlinux $@; 			\
- 	else								\
- 		printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \
  	fi;
  
  # Same as newer-prereqs, but allows to exclude specified extra dependencies