linux-next: manual merge of the rust tree with the net-next tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  rust/kernel/lib.rs

between commit:

  4d080a029db1 ("rust: sizes: add commonly used constants")

from the net-next tree and commit:

  a0d13aac7022 ("rust: rbtree: add red-black tree implementation backed by the C version")

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 rust/kernel/lib.rs
index 58ed400198bf,f10b06a78b9d..000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -43,7 -44,7 +44,8 @@@ pub mod net
  pub mod page;
  pub mod prelude;
  pub mod print;
+ pub mod rbtree;
 +pub mod sizes;
  mod static_assert;
  #[doc(hidden)]
  pub mod std_vendor;

Attachment: pgpSaUFTfAdoH.pgp
Description: OpenPGP digital signature