linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Mark Brown
2017-10-18T09:27:58Z

[-- Attachment #1.1: Type: text/plain, Size: 750 bytes --]

Hi all,

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

drivers/gpu/drm/i915/i915_gem_evict.c

between commit:

99b169d3c2052 ("drm/i915: Fix eviction when the GGTT is idle but full")

from the drm-intel-fixes tree and commit:

9c1477e83e629 ("drm/i915/selftests: Exercise adding requests to a full GGTT")

from the drm-intel tree.

I fixed it up (null diff) 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.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org