linux-next: manual merge of the rust tree with the vfs-brauner tree

[Mark Brown]

Hi all,

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

  rust/kernel/fs/file.rs

between commits:

  eed8e4c07d85c ("rust: fs: update ARef and AlwaysRefCounted imports from sync::aref")
  c37adf34a5dc5 ("rust: file: use to_result for error handling")

from the vfs-brauner tree and commit:

  e6aedde22dc42 ("rust: file: use `kernel::{fmt,prelude::fmt!}`")

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.

diff --cc rust/kernel/fs/file.rs
index f1a3fa6987451,67a3654f0fd37..0000000000000
--- a/rust/kernel/fs/file.rs
+++ b/rust/kernel/fs/file.rs
@@@ -10,9 -10,9 +10,10 @@@
  use crate::{
      bindings,
      cred::Credential,
 -    error::{code::*, Error, Result},
 +    error::{code::*, to_result, Error, Result},
+     fmt,
 -    types::{ARef, AlwaysRefCounted, NotThreadSafe, Opaque},
 +    sync::aref::{ARef, AlwaysRefCounted},
 +    types::{NotThreadSafe, Opaque},
  };
  use core::ptr;

Attachment: signature.asc
Description: PGP signature