From: Mark Brown <broonie@kernel.org>
To: Carlos Llamas <cmllamas@google.com>
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>,
Mukesh Kumar Chaurasiya <mkchauras@gmail.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the rust tree
Date: Tue, 11 Aug 2026 18:02:30 +0100 [thread overview]
Message-ID: <d59a2bca-883d-4e0b-8880-e2a887a411f8@sirena.org.uk> (raw)
In-Reply-To: <antMNVcZNPw4ojxI@google.com>
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
On Tue, Aug 11, 2026 at 04:22:13PM +0000, Carlos Llamas wrote:
> On Tue, Aug 11, 2026 at 04:15:34PM +0100, Mark Brown wrote:
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> > rust/uapi/uapi_helper.h
...
> > from the rust tree and commit:
> > f14e0c8183bc7 ("rust_binder: report netlink transactions")
> I don't think this commit touches the file mentioned below. Maybe the
> conflict was in rust/uapi/uapi_helper.h with the header includes?
Yes, sorry, forgot to update the diff before sending.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-08-11 17:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-11 15:15 linux-next: manual merge of the char-misc tree with the rust tree Mark Brown
2026-08-11 16:22 ` Carlos Llamas
2026-08-11 17:02 ` Mark Brown [this message]
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=d59a2bca-883d-4e0b-8880-e2a887a411f8@sirena.org.uk \
--to=broonie@kernel.org \
--cc=aliceryhl@google.com \
--cc=arnd@arndb.de \
--cc=cmllamas@google.com \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mkchauras@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox