* linux-next: manual merge of the drm-intel tree with the drm-intel-gt tree
@ 2022-02-24 17:51 broonie
0 siblings, 0 replies; only message in thread
From: broonie @ 2022-02-24 17:51 UTC (permalink / raw)
To: Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI
Cc: John Harrison, Linux Kernel Mailing List, Linux Next Mailing List,
Tvrtko Ursulin, Umesh Nerlige Ramappa
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
between commit:
721fd84ea1fe9 ("drm/i915/pmu: Use PM timestamp instead of RING TIMESTAMP for reference")
from the drm-intel-gt tree and commit:
b3f74938d6566 ("drm/i915/pmu: Use PM timestamp instead of RING TIMESTAMP for reference")
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.
diff --cc drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 04b8321fc7587,b3a429a92c0da..0000000000000
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
[Used drm-next version]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-02-24 17:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-24 17:51 linux-next: manual merge of the drm-intel tree with the drm-intel-gt tree broonie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox