mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
	Alice Ryhl <aliceryhl@google.com>,
	 Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	 Linux Next Mailing List <linux-next@vger.kernel.org>,
	Miguel Ojeda <ojeda@kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the rust tree
Date: Tue, 20 Oct 2026 20:04:21 +0200	[thread overview]
Message-ID: <CANiq72nsZ3u8XfFGRL5nN9jvsMekrB-Rziy-N-XxKg7KAcap3g@mail.gmail.com> (raw)
In-Reply-To: <atdeNvRKFuQd2qHz@sirena.co.uk>

On Tue, Oct 20, 2026 at 2:27 PM Mark Brown <broonie@kernel.org> wrote:
>
> 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

Looks fine, thanks!

Cheers,
Miguel

  reply	other threads:[~2026-10-20 18:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-20 12:27 Mark Brown
2026-10-20 18:04 ` Miguel Ojeda [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-10-15 14:33 Mark Brown
2026-10-15 17:24 ` Miguel Ojeda
2026-08-11 15:15 Mark Brown
2026-08-11 16:22 ` Carlos Llamas
2026-08-11 17:02   ` Mark Brown
2026-08-12  7:30     ` Miguel Ojeda

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=CANiq72nsZ3u8XfFGRL5nN9jvsMekrB-Rziy-N-XxKg7KAcap3g@mail.gmail.com \
    --to=miguel.ojeda.sandonis@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=arnd@arndb.de \
    --cc=broonie@kernel.org \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ojeda@kernel.org \
    /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®