* linux-next: manual merge of the rust tree with the bpf-next tree
@ 2021-10-18 4:51 Stephen Rothwell
2021-10-18 11:32 ` Miguel Ojeda
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-10-18 4:51 UTC (permalink / raw)
To: Miguel Ojeda, Daniel Borkmann, Alexei Starovoitov
Cc: David Miller, Networking, Adam Bratschi-Kaye, Alex Gaynor,
Ayaan Zaidi, Boqun Feng, Boris-Chengbiao Zhou, Douglas Su,
Finn Behrens, Fox Chen, Gary Guo, Geoffrey Thomas,
Kumar Kartikeya Dwivedi, Linux Kernel Mailing List,
Linux Next Mailing List, Michael Ellerman, Miguel Ojeda,
Sumera Priyadarsini, Sven Van Asbroeck, Wedson Almeida Filho,
Yuki Okushi
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the rust tree with the bpf-next tree
2021-10-18 4:51 linux-next: manual merge of the rust tree with the bpf-next tree Stephen Rothwell
@ 2021-10-18 11:32 ` Miguel Ojeda
0 siblings, 0 replies; 3+ messages in thread
From: Miguel Ojeda @ 2021-10-18 11:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Borkmann, Alexei Starovoitov, David Miller, Networking,
Adam Bratschi-Kaye, Alex Gaynor, Ayaan Zaidi, Boqun Feng,
Boris-Chengbiao Zhou, Douglas Su, Finn Behrens, Fox Chen,
Gary Guo, Geoffrey Thomas, Kumar Kartikeya Dwivedi,
Linux Kernel Mailing List, Linux Next Mailing List,
Michael Ellerman, Miguel Ojeda, Sumera Priyadarsini,
Sven Van Asbroeck, Wedson Almeida Filho, Yuki Okushi
On Mon, Oct 18, 2021 at 6:51 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
Looks correct, thanks Stephen!
I am glad you didn't have more conflicts after the rebase to v5.15-rc5.
Cheers,
Miguel
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the rust tree with the bpf-next tree
@ 2022-03-21 6:43 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2022-03-21 6:43 UTC (permalink / raw)
To: Miguel Ojeda, Daniel Borkmann, Alexei Starovoitov, Andrii Nakryiko
Cc: bpf, Networking, Alex Gaynor, Ayaan Zaidi, Boris-Chengbiao Zhou,
Finn Behrens, Gary Guo, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List,
Masami Hiramatsu, Miguel Ojeda, Milan Landaverde,
Steven Rostedt (Google),
Sven Van Asbroeck, Wedson Almeida Filho
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
samples/Makefile
between commit:
6ee64cc3020b ("fprobe: Add sample program for fprobe")
from the bpf-next tree and commit:
44d687f85cc3 ("samples: add Rust examples")
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 samples/Makefile
index 701e912ab5af,fc5e9760ea32..000000000000
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -34,4 -33,4 +34,5 @@@ subdir-$(CONFIG_SAMPLE_WATCHDOG) += wat
subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak/
obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG) += coresight/
+obj-$(CONFIG_SAMPLE_FPROBE) += fprobe/
+ obj-$(CONFIG_SAMPLES_RUST) += rust/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-21 6:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-18 4:51 linux-next: manual merge of the rust tree with the bpf-next tree Stephen Rothwell
2021-10-18 11:32 ` Miguel Ojeda
2022-03-21 6:43 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).