On Thu, 27 Dec 2018, Daniel Vetter <daniel@xxxxxxxx> wrote: > On Thu, Dec 27, 2018 at 02:56:35PM +0200, Jani Nikula wrote: >> First make some drm headers self-contained, removing the implicit >> dependency on a previous drmP.h include. Then remove all drmP.h includes >> from drm/i915. >> >> Inspired by Sam's series [1]. Theres a one line trivial conflict between >> that one and this series in drm_file.h (patch 3), but I'm keeping this >> series self-contained. Should be easy enough to resolve. >> >> I'm fine with merging the first 5 through either drm-misc or drm-intel, >> but I'd rather merge the last one through drm-intel. > > Usually I'd say stuff it into drm-misc and then backmerge for the last > patch, but -rc1 is still a few weeks away I think, so not great. Probably > best if you stuff this into a topic branch in drm-intel, and then send out > pull requests to both drm-misc-next and dinq. Thanks for all the reviews, pushed patches 1-5 to topic/drmp-cleanup with $(git merge-base drm-misc-next drm-intel-next-queued) as the starting point. It's also included in drm-tip now. I'll probably let it simmer there until, uh, next year, and send the pull requests to drm-misc and drm-intel after that. And then apply patch 6 on top of dinq. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
