Re: linux-next: manual merge of the char-misc tree with the rust tree
Mark Brown <[email protected]>
| Newsgroups | org.kernel.vger.linux-next,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
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.
signature.asc
(application/pgp-signature, 488 B)
-----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmp7VaYACgkQJNaLcl1U h9BjRwf/egrSviSQDl5fYHrXXP40uO70MEwNrWrb/MypuRhTZbpwgj/oavB+ciNc oxMHZrf+74ck6Xui0E+I4j2pXL736PXbFtPzSg4DMtDGj9SVSeVrfF87yD97QWi4 qRtPCkgUA7f7HlcNFGUZ7PZyl0I7PK6h8mPtwfkT+XvFO3OP+mNtseVEEr3FtUiC 5a1QOVmgy1HyI/j6gqR40Kjb55I84bNpm9qs5Tq++7N/QInbHN8He/ieZVK4hMQL ZR+0IAiEKhM7ZJOHBzJvIMuAbJ7yRKet+lVWzXwQwitF+avOXzxXuBfIcUii8WEa mGAg3tsNE2L7ZRsEvBspcjO3AjLNOw== =nX9d -----END PGP SIGNATURE-----