* linux-next: manual merge of the drm tree with the tree
@ 2015-12-03 14:41 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2015-12-03 14:41 UTC (permalink / raw)
To: Dave Airlie, Jani Nikula, Patrik Jakobsson, Imre Deak,
Ville Syrjälä
Cc: linux-next, linux-kernel, dri-devel
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_runtime_pm.c between commit
ac9b8236551d11 ("drm/i915: Introduce a gmbus power domain") from the
drm-intel-fixes tree and commit 73dfc227ff5c8e005 ("drm/i915/skl: init/uninit
display core as part of the HW power domain state") from the drm tree. It
also seems like the gmbus power domain commit has been added in both trees.
I fixed it up (resulting in an empty diff) and can carry the fix as necessary
(no action is required).
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-12-03 14:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-03 14:41 linux-next: manual merge of the drm tree with the tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox