Messages in this thread | | | Date | Tue, 21 Mar 2017 11:37:07 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree |
| |
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/gvt/scheduler.c
between commit:
3cd23b828b37 ("drm/i915/gvt: GVT pin/unpin shadow context")
from the drm-intel-fixes tree and commit:
e642c85b03de ("drm/i915: Remove superfluous i915_add_request_no_flush() helper")
from the drm-intel 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.
-- Cheers, Stephen Rothwell
diff --cc drivers/gpu/drm/i915/gvt/scheduler.c index 39a83eb7aecc,31d2240fdb1f..000000000000 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@@ -246,10 -212,7 +244,10 @@@ out workload->status = ret; if (!IS_ERR_OR_NULL(rq)) - i915_add_request_no_flush(rq); + i915_add_request(rq); + else + engine->context_unpin(engine, shadow_ctx); + mutex_unlock(&dev_priv->drm.struct_mutex); return ret; }
| |