linux-next: manual merge of the char-misc tree with the rust tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/android/binder/thread.rs

between commit:

  a12f22b2c9398 ("rust_binder: use pr_*_ratelimited! for printing")

from the rust tree and commit:

  985955d8e6b2b ("rust_binder: wake epoll on self-work queued to poll thread")

from the char-misc 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 drivers/android/binder/thread.rs
index e0ed20f510fd1,177e90a1e5a3f..0000000000000
--- a/drivers/android/binder/thread.rs
+++ b/drivers/android/binder/thread.rs
@@@ -344,13 -345,13 +345,13 @@@ impl InnerThread 
          }
      }
  
-     fn push_return_work(&mut self, reply: u32) {
+     fn push_return_work(&mut self, reply: u32) -> PushWorkRes {
          if let Ok(work) = ListArc::try_from_arc(self.return_work.clone()) {
              work.set_error_code(reply);
-             // Not notifying: Reply to current thread.
-             let _ = self.push_work(work);
+             self.push_work(work)
          } else {
 -            pr_warn!("Thread return work is already in use.");
 +            pr_warn_ratelimited!("Thread return work is already in use.\n");
+             PushWorkRes::Ok
          }
      }
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]