linux-next: manual merge of the rust tree with the drm tree

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 fix

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

On Tue, Mar 11, 2025 at 10:17 AM Stephen Rothwell wrote: > > I fixed it up (I guess - see below) and can carry the fix as necessary. Looks good to me, thanks! Cheers, Miguel