[lkml]   [2017]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the drm-misc tree with Linus' tree
Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:


between commit:

fd70075f82b7 ("drm/i915: Trim struct_mutex usage for kms")

from Linus' tree and commits:

21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.")
669c9215afea ("drm/atomic: Make async plane update checks work as intended, v2.")

from the drm-misc tree.

I fixed it up (I basically used the latter version of the changes to
intel_legacy_cursor_update()) 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.

Stephen Rothwell

 \ /
  Last update: 2017-09-22 04:25    [W:0.048 / U:0.368 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site