Messages in this thread | | | Subject | Re: linux-next: manual merge of the drm tree with Linus' tree | From | Philipp Zabel <> | Date | Tue, 20 Sep 2016 14:25:52 +0200 |
| |
Hi Stephen,
Am Dienstag, den 20.09.2016, 12:42 +1000 schrieb Stephen Rothwell: > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/imx/ipuv3-crtc.c > > between commit: > > a474478642d5 ("drm/imx: fix crtc vblank state regression") > > from Linus' tree and commit: > > 5f4df0c769a9 ("drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag") > > from the drm tree. > > I fixed it up (I think - see below) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts.
Thank you for the fix. It shouldn't be critical, but I'd put the drm_crtc_vblank_off last, for symmetry reasons.
regards Philipp
| |