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

On Tue, Aug 25, 2026 at 01:08:55PM +0200, Greg KH wrote:
> On Tue, Aug 25, 2026 at 12:49:54PM +0200, Miguel Ojeda wrote:
> > 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]/
> 
> Yeah, it's messy.
> 
> Below is my resolution, seems to work here for me and I'll send it along
> to Linus as well.

Now sent here:
	https://lore.kernel.org/r/2026082525-spoils-gutless-f1ff@gregkh