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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Adam Bratschi-Kaye <ark.email@gmail.com>,
	Alex Gaynor <alex.gaynor@gmail.com>,
	Andrii Nakryiko <andrii@kernel.org>,
	Antonio Terceiro <antonio.terceiro@linaro.org>,
	Boqun Feng <boqun.feng@gmail.com>,
	Boris-Chengbiao Zhou <bobo1239@web.de>, Daniel Xu <dxu@dxuuu.xyz>,
	Dariusz Sosnowski <dsosnowski@dsosnowski.pl>,
	Douglas Su <d0u9.su@outlook.com>, Finn Behrens <me@kloenk.de>,
	Gary Guo <gary@garyguo.net>, Jiri Olsa <jolsa@kernel.org>,
	Jiri Olsa <jolsa@redhat.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Miguel Ojeda <ojeda@kernel.org>,
	Sven Van Asbroeck <thesven73@gmail.com>,
	Wedson Almeida Filho <wedsonaf@google.com>
Subject: Re: linux-next: manual merge of the rust tree with Linus' tree
Date: Thu, 4 Nov 2021 08:01:52 +1100	[thread overview]
Message-ID: <20211104080152.41c38912@canb.auug.org.au> (raw)
In-Reply-To: <CANiq72=fuk-eVuCpW5jkDn71Pbs=1L2LhSvadR_bTjxcPvtVUQ@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1799 bytes --]

Hi Miguel,

On Wed, 3 Nov 2021 11:30:35 +0100 Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> wrote:
>
> On Wed, Nov 3, 2021 at 4:19 AM Stephen Rothwell <sfr@canb.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.

Oops, sorry about that.  I have added it back from today.

BTW, are you intending to submit the rust tree this merge window?

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]