On 03/06/17 04:31, Dave Airlie wrote: > On 2 June 2017 at 18:48, Tomi Valkeinen <tomi.valkei...@ti.com> wrote: >> Hi Dave, >> >> Here's second attempt for omapdrm changes for v4.13. The first version >> conflicts >> with the latest drm-next due to the DRM_ROTATE flag changes. This one is >> rebased >> on top of the latest drm-next. > > As much as I dislike rebases (hope you tested), I did try and pull the > original yesterday, saw conflict nightmare, and held off until I had > more brain bandwidth to look. Thanks for providing a clean pull in the > meantime, read my mind!
Yes, the conflict was quite messy. Of course there had to be a DRM_ROTATE flag rename just at the same time when I did a major rotate rework for omapdrm =). I guess you could pull the first version, and solve the conflict by taking the omapdrm code from the second pull request. But, while I also dislike rebases like this (yes, I tested and compared the diff to the first pull request), I'm not sure if that would buy us much. In any case, I'll do a second round of testing when the pull is in drm-next. Tomi
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
