| Message ID | 20250311201726.3f45cc67@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the rust tree with the drm tree | expand |
On Tue, Mar 11, 2025 at 10:17 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > I fixed it up (I guess - see below) and can carry the fix as necessary. Looks good to me, thanks! Cheers, Miguel
diff --cc drivers/gpu/drm/drm_panic_qr.rs index 5d21f6d10bcb,ecd87e8ffe05..000000000000 --- a/drivers/gpu/drm/drm_panic_qr.rs
Hi all, Today's linux-next merge of the rust tree got a conflict in: drivers/gpu/drm/drm_panic_qr.rs between commit: dbed4a797e00 ("drm/panic: Better binary encoding in QR code") from the drm tree and commit: fc2f191f850d ("panic_qr: use new #[export] macro") from the rust tree. I fixed it up (I guess - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.