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

[Mark Brown]

Hi all,

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

  drivers/android/binder/thread.rs

between commit:

  bb66b1a345253 ("rust_binder: only print failure if error has source")

from the char-misc.current tree and commit:

  c61f3ad2213cf ("rust_binder: Implement BINDER_DEBUG_FAILED_TRANSACTION")

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 bc0ef8927905c,a51821dde0adf..0000000000000
--- a/drivers/android/binder/thread.rs
+++ b/drivers/android/binder/thread.rs
@@@ -1273,14 -1295,25 +1295,24 @@@ impl Thread 
                          inner.extended_error =
                              ExtendedError::new(info.debug_id as u32, err.reply, source.to_errno());
                      }
 -                }
  
-                     pr_warn!(
-                         "{}:{} transaction to {} failed: {err:?}",
-                         info.from_pid,
-                         info.from_tid,
-                         info.to_pid
 -                binder_debug!(
 -                    FailedTransaction,
 -                    "transaction {} to {}:{} failed {:?}, code {} size {}-{}",
 -                    if info.is_reply {
 -                        "reply"
 -                    } else if info.is_oneway() {
 -                        "async"
 -                    } else {
 -                        "call"
 -                    },
 -                    info.to_pid,
 -                    info.to_tid,
 -                    err,
 -                    info.code,
 -                    info.data_size,
 -                    info.offsets_size
 -                );
++                    binder_debug!(
++                        FailedTransaction,
++                        "transaction {} to {}:{} failed {:?}, code {} size {}-{}",
++                        if info.is_reply {
++                            "reply"
++                        } else if info.is_oneway() {
++                            "async"
++                        } else {
++                            "call"
++                        },
++                        info.to_pid,
++                        info.to_tid,
++                        err,
++                        info.code,
++                        info.data_size,
++                        info.offsets_size
 +                    );
-                 }
              }
          }

Attachment: signature.asc
Description: PGP signature