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

[Greg KH]

On Tue, Jul 21, 2026 at 08:28:05AM +0000, Alice Ryhl wrote:
> On Mon, Jul 20, 2026 at 03:44:42PM +0100, Mark Brown wrote:
> > 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
> >  +                    );
> > -                 }
> >               }
> >           }
> 
> I think you're missing a closing } after the binder_debug! call.
> Otherwise LGTM.
> 
> error: this file contains an unclosed delimiter
>     --> drivers/android/binder/thread.rs:1743:3
>      |
> 453  | impl Thread {
>      |             - unclosed delimiter
> ...
> 1290 |                 if let Some(source) = &err.source {
>      |                                                   - this delimiter might not be properly closed...
> ...
> 1316 |             }
>      |             - ...as it matches this but it has different indentation
> ...
> 1743 | }
>      |  ^
> 
> error: aborting due to 1 previous error

That trailing ) on the same indent line just looks odd to me, which is
why I can see it's going to be easy to make this type of merge
mistake...

I've done this now in my tree so all should be good going forward,
thanks!

greg k-h