linux-next: manual merge of the drm tree with Linus' tree
diff mbox series

Message ID 20191113114034.3332d688@canb.auug.org.au
State New
Headers show
Series
  • linux-next: manual merge of the drm tree with Linus' tree
Related show

Commit Message

Stephen Rothwell Nov. 13, 2019, 12:40 a.m. UTC
Hi all,

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

  drivers/gpu/drm/i915/gem/i915_gem_context.c

between commit:

  f8c08d8faee5 ("drm/i915/cmdparser: Add support for backward jumps")

from Linus' tree and commit:

  a4e7ccdac38e ("drm/i915: Move context management under GEM")

from the drm tree.

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

Patch
diff mbox series

diff --cc drivers/gpu/drm/i915/gem/i915_gem_context.c
index e41fd94ae5a9,de6e55af82cf..000000000000
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c