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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CANiq72=fuk-eVuCpW5jkDn71Pbs=1L2LhSvadR_bTjxcPvtVUQ@mail.gmail.com>
Date:   Wed, 3 Nov 2021 11:30:35 +0100
From:   Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Adam Bratschi-Kaye <ark.email@...il.com>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Andrii Nakryiko <andrii@...nel.org>,
        Antonio Terceiro <antonio.terceiro@...aro.org>,
        Boqun Feng <boqun.feng@...il.com>,
        Boris-Chengbiao Zhou <bobo1239@....de>,
        Daniel Xu <dxu@...uu.xyz>,
        Dariusz Sosnowski <dsosnowski@...snowski.pl>,
        Douglas Su <d0u9.su@...look.com>, Finn Behrens <me@...enk.de>,
        Gary Guo <gary@...yguo.net>, Jiri Olsa <jolsa@...nel.org>,
        Jiri Olsa <jolsa@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Ellerman <mpe@...erman.id.au>,
        Miguel Ojeda <ojeda@...nel.org>,
        Sven Van Asbroeck <thesven73@...il.com>,
        Wedson Almeida Filho <wedsonaf@...gle.com>
Subject: Re: linux-next: manual merge of the rust tree with Linus' tree

Hi Stephen,

On Wed, Nov 3, 2021 at 4:19 AM Stephen Rothwell <sfr@...b.auug.org.au> 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