Not 100% sure if I correctly fixed drm-tip

Thomas Zimmermann tzimmermann at suse.de
Thu Feb 11 14:37:19 UTC 2021


(cc'ing Jani)

Am 11.02.21 um 11:01 schrieb Christian König:
> Hi guys,
> 
> I had a conflict this morning in the ttm pool while pushing an important 
> fix to drm-misc-fixes.
> 
> I'm not 100% sure if I correctly fixed up drm-tip. How can this be 
> double checked? And how can it be fixed if the merge has gone bad?
> 
> Thanks,
> Christian.
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20210211/73d34444/attachment.sig>


More information about the dri-devel mailing list