Hi Jani, I need your help merging this series, as it touches files in both drm-intel and drm-misc:
https://patchwork.freedesktop.org/series/71637/ The first patch touches some i915 files, and applies cleanly to both dinq and drm-misc-next. The second patch relies on the first patch as well as on the new panel_orientation member of struct drm_cmdline_mode which was recently introduced in drm-misc-next and which is not yet present in struct drm_cmdline_mode in drm-intel-next-queued. So both patches can be pushed without issues to drm-misc-next, but then a back-merge of drm-misc-next into dinq should be done to avoid future changes to dinq causing causing conflicts. This seems the easiest way to merge this. If you want I can push the 2 patch to drm-misc-next myself, then you can do the backmerge after that. Alternatively you could back-merge drm-misc-next into dinq before merging these into dinq, but the first patch changes some generic code, so then another backmerge of dinq into drm-misc-next should probably be done after that, so that seems suboptimal. Regards, Hans _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
