From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D5583BADA5 for ; Tue, 21 Jul 2026 08:28:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.72 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784622489; cv=none; b=AcE9LJTOgfMTqxRTjpKJCuoFFCDEJSNnU5i3Lhsb2bmZyoBKcgzuqJr3iQwv/CMfylNgc8gG6vHxjpQduBDrDQJhIFgcuynqp8PVAV1Wh5FKphRpHiiUQdRpKRo6bwuj4UweLUWZY6s81v5EewabbjsKrn3+AjKg2TLJogSWrKk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784622489; c=relaxed/simple; bh=aVwFCfjug6v0YMLQCQrPWF+ub4F4PacKG/H1vVP0GRU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RrCtDph0oKEQxbr82SpeBqKkwG1DTE2lZym0VJD8kgi3McuWxnrRv58O2Q7Ap99BFY+YXRtLC8y/SGvDNpM09zAdD4QwcL/XHWVxPQLP43xhM5Tv9GKz3jvTST9wFAaLMiACB3SCuPn4CrtkgKlEmDGHDlRl628NHg8fTyFqsvk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=epU8EbuS; arc=none smtp.client-ip=209.85.221.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="epU8EbuS" Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-47f6db77430so1988729f8f.0 for ; Tue, 21 Jul 2026 01:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784622486; x=1785227286; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=51dWd0aEDtrjal+0qBQ6E+UL9ljUkI8QsdqMhhO3wf8=; b=epU8EbuSMNVwatnXNKdDXzWYF79nUBEX/8M39Lhdo14J1SLmuZe2hHbKytXAm/thlQ ih/a6/d84ZK+evYF8At6aUXZpu3kzOOUZBYwTLcuuZQWaR+BxikW6L4crdmbdIZImQFs lNVNXqHAqYzBzQ8Q3X8aPTStPqyqMzrItPtbQcbpWXG6+0ObWPoCQNsVqDWdIRggdHgA 0SMRidQgnuCUBonCIU+T32fl9NJscrKe7IteAQg/tsWIzAn4nripSkZsHKQJNLU5LNYK 4K0dhnCx2uIJ/x+Kzb/tejOXklub1E2A0msKLkMV2s/2jX6uJMPMynB1zkN7ZRixDtD7 BPKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784622486; x=1785227286; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=51dWd0aEDtrjal+0qBQ6E+UL9ljUkI8QsdqMhhO3wf8=; b=dKQ58jNgiGM9nTKKghI5Qac3qr7lVtjSFM+AunSII8v6j+/+25++0P1OOsmmfNBkir qMsyPJg0VoHp6IzZE0Kxa3gAs1rfgaY0yEqeJdHmgtSFp6Yw7Y7ewNAKVGTJu4u1mL1W wYW2JYfALLXtXTMUM5g+fNrE8vV0MMSNThqB21pTm764G0AONBUtb50lcQr0tD2/rguG +CNQDA9b9uDaH9p7JOLDMXcFuaSSKtle9z2UPrR4QUWcbXqn4KKkvKWSDWlknRz6OJoH FyxJUaoDZPxWVFcGdsiEmxE0JAMVbD/EYWdpuc6nePD6F8Gl6wfN7s5Ll+zRfWepiW1D vLyA== X-Forwarded-Encrypted: i=1; AHgh+Rr/z8LSo8vpNMEGSuQjEHwpxBkQUicM1AGYPRQy9iJYZNr9CS4/GeVgxYk0Wu59QEeNs8vXXF7oFsRCRQg=@vger.kernel.org X-Gm-Message-State: AOJu0YxTtFNjGRQ3JM10G7DSkTGyoDaHQP03yIiPs2Qy3xXM/tlkZjmz OEP1kteVx7SLeaGQgpL79ZNGIYEceP368kHKHlg59O8wsKiv94+LQd8ND+KOJFI9TtrCgyHIcPX lk4oeY/iDgBTK1BSqNg== X-Received: from wmbea10.prod.google.com ([2002:a05:600c:674a:b0:495:5b59:7a9c]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5887:b0:493:b56b:c45c with SMTP id 5b1f17b1804b1-4954a40d424mr136459235e9.30.1784622485977; Tue, 21 Jul 2026 01:28:05 -0700 (PDT) Date: Tue, 21 Jul 2026 08:28:05 +0000 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: Message-ID: Subject: Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree From: Alice Ryhl To: Mark Brown Cc: Greg KH , Arnd Bergmann , Greg Kroah-Hartman , Jahnavi MN , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="utf-8" 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 Alice