From: Nathan Chancellor <nathan@kernel.org>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Mark Brown <broonie@kernel.org>, Miguel Ojeda <ojeda@kernel.org>,
Gary Guo <gary@garyguo.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Stoakes <ljs@kernel.org>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild-fixes tree
Date: Wed, 21 Oct 2026 12:00:17 -0700 [thread overview]
Message-ID: <20261021190017.GA2611266@ax162> (raw)
In-Reply-To: <CANiq72=fy3XAqXCBCwQ8AhWRNPSruDe4fxDAdzaUhUw94FAS-g@mail.gmail.com>
On Wed, Oct 21, 2026 at 06:01:17PM +0200, Miguel Ojeda wrote:
> On Wed, Oct 21, 2026 at 3:57 PM Mark Brown <broonie@kernel.org> wrote:
> >
> > Today's linux-next merge of the rust tree got a conflict in:
> >
> > init/Kconfig
> >
> > between commit:
> >
> > f85147b291e35 ("kbuild: move the toolchain checks into scripts/Kconfig.toolchain")
> >
> > from the kbuild-fixes tree and commit:
> >
> > 3504d1bce9920 ("rust: kunit: use `file!()` inside `kunit_assert!`")
> >
> > from the rust tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
>
> Seems fine, thanks!
Agreed. I let Linus know about this one at the same time as another
conflict.
--
Cheers,
Nathan
prev parent reply other threads:[~2026-10-21 19:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-21 12:19 linux-next: manual merge of the rust tree with the kbuild-fixes tree Mark Brown
2026-10-21 16:01 ` Miguel Ojeda
2026-10-21 19:00 ` Nathan Chancellor [this message]
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=20261021190017.GA2611266@ax162 \
--to=nathan@kernel.org \
--cc=broonie@kernel.org \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@kernel.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--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 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.