linux-kernel - linux-next: manual merge of the rust tree with the bpf-next 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20220321174301.3a1b3943@canb.auug.org.au>
Date:   Mon, 21 Mar 2022 17:43:01 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
        Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Andrii Nakryiko <andrii@...nel.org>
Cc:     bpf <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Ayaan Zaidi <zaidi.ayaan@...il.com>,
        Boris-Chengbiao Zhou <bobo1239@....de>,
        Finn Behrens <me@...enk.de>, Gary Guo <gary@...yguo.net>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Miguel Ojeda <ojeda@...nel.org>,
        Milan Landaverde <milan@...verde.com>,
        "Steven Rostedt (Google)" <rostedt@...dmis.org>,
        Sven Van Asbroeck <thesven73@...il.com>,
        Wedson Almeida Filho <wedsonaf@...gle.com>
Subject: linux-next: manual merge of the rust tree with the bpf-next tree

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/

Content of type "application/pgp-signature" skipped