Re: merge problems with char-misc-next and Linus's branch right now

Miguel Ojeda <[email protected]> Tue, 25 Aug 2026 12:49:54 +0200

Newsgroups	org.kernel.vger.rust-for-linux
Message-ID	<CANiq72krVngy9cC1X9q55THEC=5Od_Bbo5=V5ax8jZovW6ENtg@mail.gmail.com>

On Tue, Aug 25, 2026 at 12:05 PM Alvin Sun <[email protected]> wrote:
>
> Gary has already posted a fix:
> https://lore.kernel.org/rust-for-linux/[email protected]/

Yeah, please see as well the other conflicts related to char-misc this cycle:

  https://lore.kernel.org/linux-next/[email protected]/

  https://lore.kernel.org/linux-next/[email protected]/
    (the diff in that thread is from another conflict somehow, but the
    actual conflict is very simple anyway)

The resolutions in linux-next should be fine.

My overall list of conflicts for Linus is at:

  https://lore.kernel.org/rust-for-linux/[email protected]/

Cheers,
Miguel