linux-kernel - linux-next: manual merge of the rust tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20220912172440.76a19053@canb.auug.org.au>
Date:   Mon, 12 Sep 2022 17:24:40 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
Cc:     Daniel Bristot de Oliveira <bristot@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Steven Rostedt (Google)" <rostedt@...dmis.org>
Subject: linux-next: manual merge of the rust tree with Linus' tree

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  MAINTAINERS

between commit:

  fa4b9df00af4 ("MAINTAINERS: Add Runtime Verification (RV) entry")

from Linus' tree and commit:

  fa4b9df00af4 ("MAINTAINERS: Add Runtime Verification (RV) entry")

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 MAINTAINERS
index cfb38ad66cfc,263ff9abca0b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -17806,17 -17477,24 +17806,35 @@@ L:	linux-rdma@...r.kernel.or
  S:	Maintained
  F:	drivers/infiniband/ulp/rtrs/
  
 +RUNTIME VERIFICATION (RV)
 +M:	Daniel Bristot de Oliveira <bristot@...nel.org>
 +M:	Steven Rostedt <rostedt@...dmis.org>
 +L:	linux-trace-devel@...r.kernel.org
 +S:	Maintained
 +F:	Documentation/trace/rv/
 +F:	include/linux/rv.h
 +F:	include/rv/
 +F:	kernel/trace/rv/
 +F:	tools/verification/
 +
+ RUST
+ M:	Miguel Ojeda <ojeda@...nel.org>
+ M:	Alex Gaynor <alex.gaynor@...il.com>
+ M:	Wedson Almeida Filho <wedsonaf@...gle.com>
+ R:	Boqun Feng <boqun.feng@...il.com>
+ R:	Gary Guo <gary@...yguo.net>
+ R:	Björn Roy Baron <bjorn3_gh@...tonmail.com>
+ L:	rust-for-linux@...r.kernel.org
+ S:	Supported
+ W:	https://github.com/Rust-for-Linux/linux
+ B:	https://github.com/Rust-for-Linux/linux/issues
+ T:	git https://github.com/Rust-for-Linux/linux.git rust-next
+ F:	Documentation/rust/
+ F:	rust/
+ F:	samples/rust/
+ F:	scripts/*rust*
+ K:	\b(?i:rust)\b
+ 
  RXRPC SOCKETS (AF_RXRPC)
  M:	David Howells <dhowells@...hat.com>
  M:	Marc Dionne <marc.dionne@...istor.com>

Content of type "application/pgp-signature" skipped