From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail•com>,
Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>
Cc: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
Adam Bratschi-Kaye <ark.email@gmail•com>,
Alex Gaynor <alex.gaynor@gmail•com>,
Ayaan Zaidi <zaidi.ayaan@gmail•com>,
Boqun Feng <boqun.feng@gmail•com>,
Boris-Chengbiao Zhou <bobo1239@web•de>,
Douglas Su <d0u9.su@outlook•com>, Finn Behrens <me@kloenk•de>,
Fox Chen <foxhlchen@gmail•com>, Gary Guo <gary@garyguo•net>,
Geoffrey Thomas <geofft@ldpreload•com>,
Kumar Kartikeya Dwivedi <memxor@gmail•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>,
Sumera Priyadarsini <sylphrenadin@gmail•com>,
Sven Van Asbroeck <thesven73@gmail•com>,
Wedson Almeida Filho <wedsonaf@google•com>,
Yuki Okushi <jtitor@2k36•org>
Subject: linux-next: manual merge of the rust tree with the bpf-next tree
Date: Mon, 18 Oct 2021 15:51:13 +1100 [thread overview]
Message-ID: <20211018155113.1303fa5e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1634 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-10-18 4:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 4:51 Stephen Rothwell [this message]
2021-10-18 11:32 ` linux-next: manual merge of the rust tree with the bpf-next tree Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2022-03-21 6:43 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211018155113.1303fa5e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex.gaynor@gmail$(echo .)com \
--cc=ark.email@gmail$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=bobo1239@web$(echo .)de \
--cc=boqun.feng@gmail$(echo .)com \
--cc=d0u9.su@outlook$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=foxhlchen@gmail$(echo .)com \
--cc=gary@garyguo$(echo .)net \
--cc=geofft@ldpreload$(echo .)com \
--cc=jtitor@2k36$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=me@kloenk$(echo .)de \
--cc=memxor@gmail$(echo .)com \
--cc=miguel.ojeda.sandonis@gmail$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
--cc=sylphrenadin@gmail$(echo .)com \
--cc=thesven73@gmail$(echo .)com \
--cc=wedsonaf@google$(echo .)com \
--cc=zaidi.ayaan@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox