From: Greg KH <greg@kroah.com>
To: Mark Brown <broonie@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Carlos Llamas <cmllamas@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Tomer Pomeranc <tomerpo@gmail.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
Date: Fri, 18 Sep 2026 18:33:36 +0100 [thread overview]
Message-ID: <2026091827-actress-irritate-95c7@gregkh> (raw)
In-Reply-To: <aq0wIywjYmlWf77i@sirena.org.uk>
On Fri, Sep 18, 2026 at 01:35:47PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/android/binder.c
>
> between commits:
>
> c4c02084d6687 ("binder: fix leaked fd fixups on TF_UPDATE_TXN supersede")
> 22c135635fdd9 ("binder: fix is_failure flag for superseded transaction cleanup")
>
> from the char-misc.current tree and commit:
>
> fd2bc059ed466 ("binder: rm -f binder.c")
>
> 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.
>
> (Deleted the file)
that's the correct fix, thanks!
greg k-h
next prev parent reply other threads:[~2026-09-18 17:35 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-18 12:35 Mark Brown
2026-09-18 17:33 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-07-20 14:46 Mark Brown
2026-07-27 12:18 ` Greg KH
2026-07-20 14:44 Mark Brown
2026-07-21 8:28 ` Alice Ryhl
2026-07-27 12:18 ` Greg KH
2026-05-25 15:07 Mark Brown
2025-11-14 3:32 Stephen Rothwell
2025-11-14 19:10 ` Dinh Nguyen
2025-10-24 1:49 Stephen Rothwell
2025-10-24 5:24 ` Greg KH
2021-12-06 3:49 Stephen Rothwell
2021-12-06 13:43 ` Andy Shevchenko
2021-12-06 16:17 ` Ralph Siemsen
2021-12-06 16:44 ` Andy Shevchenko
2021-12-13 9:18 ` Greg KH
2022-01-07 23:18 ` Kees Cook
2019-10-18 3:26 Stephen Rothwell
2019-10-18 10:06 ` Greg KH
2019-04-03 3:56 Stephen Rothwell
2019-04-03 5:06 ` Srinivas Kandagatla
2019-04-03 6:39 ` Bo YU
2018-12-04 4:35 Stephen Rothwell
2018-12-04 7:42 ` Greg KH
2018-12-04 8:46 ` Dexuan Cui
2018-12-10 9:47 ` Greg KH
2018-12-10 18:51 ` Dexuan Cui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2026091827-actress-irritate-95c7@gregkh \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=cmllamas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tomerpo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®