Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1660698

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

Show all headers | View raw

Hi all,

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

  drivers/gpu/drm/i915/i915_gem_gtt.c

between commit:

  d90c98905afd ("drm/i915: Guard against i915_ggtt_disable_guc() being invoked unconditionally")
(which also appears as commit cb60606d835c in the drm-intel tree)

from the drm-intel-fixes tree and commit:

  04f7b24eccdf ("drm/i915/guc: Assert that we switch between known ggtt->invalidate functions")

from the drm-intel tree.

I fixed it up (I just used the drm-intel tree version) 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.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the drm-intel tree with the  drm-intel-fixes tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-08 05:10 +0200

csiph-web