From: Greg KH <gregkh@linuxfoundation.org>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: rust-for-linux@vger.kernel.org, Alice Ryhl <aliceryhl@google.com>,
Gary Guo <gary@garyguo.net>, Alvin Sun <alvin.sun@linux.dev>
Subject: Re: merge problems with char-misc-next and Linus's branch right now
Date: Tue, 25 Aug 2026 13:45:56 +0200 [thread overview]
Message-ID: <2026082545-borrowing-grading-fc82@gregkh> (raw)
In-Reply-To: <2026082514-such-version-4236@gregkh>
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 <alvin.sun@linux.dev> wrote:
> > >
> > > Gary has already posted a fix:
> > > https://lore.kernel.org/rust-for-linux/20260813163951.1102583-1-gary@kernel.org/
> >
> > Yeah, please see as well the other conflicts related to char-misc this cycle:
> >
> > https://lore.kernel.org/linux-next/20260805-slab-rust-fix-v1-1-c4d4c1b69de2@kernel.org/
> >
> > https://lore.kernel.org/linux-next/ans8lsGbkro4pO6N@sirena.org.uk/
> > (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/20260816191926.230123-1-ojeda@kernel.org/
>
> 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
next prev parent reply other threads:[~2026-08-25 11:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-25 9:05 merge problems with char-misc-next and Linus's branch right now Greg KH
2026-08-25 10:00 ` Alvin Sun
2026-08-25 10:49 ` Miguel Ojeda
2026-08-25 11:08 ` Greg KH
2026-08-25 11:45 ` Greg KH [this message]
2026-08-25 10:53 ` Greg KH
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=2026082545-borrowing-grading-fc82@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=aliceryhl@google.com \
--cc=alvin.sun@linux.dev \
--cc=gary@garyguo.net \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=rust-for-linux@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.