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>,
Andrii Nakryiko <andrii@kernel.org>
Cc: bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
Alex Gaynor <alex.gaynor@gmail.com>,
Ayaan Zaidi <zaidi.ayaan@gmail.com>,
Boris-Chengbiao Zhou <bobo1239@web.de>,
Finn Behrens <me@kloenk.de>, Gary Guo <gary@garyguo.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Miguel Ojeda <ojeda@kernel.org>,
Milan Landaverde <milan@mdaverde.com>,
"Steven Rostedt (Google)" <rostedt@goodmis.org>,
Sven Van Asbroeck <thesven73@gmail.com>,
Wedson Almeida Filho <wedsonaf@google.com>
Subject: linux-next: manual merge of the rust tree with the bpf-next tree
Date: Mon, 21 Mar 2022 17:43:01 +1100 [thread overview]
Message-ID: <20220321174301.3a1b3943@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2022-03-21 6:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 6:43 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-18 4:51 Stephen Rothwell
2021-10-18 11:32 ` Miguel Ojeda
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=20220321174301.3a1b3943@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alex.gaynor@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bobo1239@web.de \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=me@kloenk.de \
--cc=mhiramat@kernel.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=milan@mdaverde.com \
--cc=netdev@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rostedt@goodmis.org \
--cc=thesven73@gmail.com \
--cc=wedsonaf@google.com \
--cc=zaidi.ayaan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®