linux-next: manual merge of the rust tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1955 bytes --]

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@vger.kernel.or
  S:	Maintained
  F:	drivers/infiniband/ulp/rtrs/
  
 +RUNTIME VERIFICATION (RV)
 +M:	Daniel Bristot de Oliveira <bristot@kernel.org>
 +M:	Steven Rostedt <rostedt@goodmis.org>
 +L:	linux-trace-devel@vger.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@kernel.org>
+ M:	Alex Gaynor <alex.gaynor@gmail.com>
+ M:	Wedson Almeida Filho <wedsonaf@google.com>
+ R:	Boqun Feng <boqun.feng@gmail.com>
+ R:	Gary Guo <gary@garyguo.net>
+ R:	Björn Roy Baron <bjorn3_gh@protonmail.com>
+ L:	rust-for-linux@vger.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@redhat.com>
  M:	Marc Dionne <marc.dionne@auristor.com>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]