Hi Felix, On Wed, 3 Jul 2019 21:03:32 +0000 "Kuehling, Felix" <Felix.Kuehling@xxxxxxx> wrote: > > It looks like Stephen already applied my patch as a conflict resolution > on linux-next, though. I see linux-next/master is getting updated > non-fast-forward. So is the idea that its history will updated again > with the final resolution on drm-next or drm-fixes? linux-next gets rebased every day (that is its nature). Do not worry about that, I will cope with whatever you do. -- Cheers, Stephen Rothwell
Attachment:
pgpiK4Ns1gjmZ.pgp
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
