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

[Miguel Ojeda]

Hi Stephen,

On Wed, Nov 3, 2021 at 4:19 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> diff --cc scripts/Makefile.modfinal
> index 7f39599e9fae,c0842e999a75..000000000000
> --- a/scripts/Makefile.modfinal
> +++ b/scripts/Makefile.modfinal
> @@@ -39,11 -39,12 +39,12 @@@ quiet_cmd_ld_ko_o = LD [M]  $
>
>   quiet_cmd_btf_ko = BTF [M] $@
>         cmd_btf_ko =                                                    \
> -       if [ -f vmlinux ]; then                                         \
> -               LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \
> -               $(RESOLVE_BTFIDS) -b vmlinux $@;                        \
> -       else                                                            \
> +       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 $@; \
> ++              LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \
>         fi;

It looks like the `$(RESOLVE_BTFIDS)` line is gone with this
resolution. The rest looks good.

Thanks!

Cheers,
Miguel