Re: linux-next: manual merge of the char-misc tree with the rust tree

[Mark Brown]

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: signature.asc
Description: PGP signature