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

Stephen Rothwell
2016-09-08T02:08:52Z

drivers/gpu/drm/i915/intel_pm.c

between commit:

9909113cc48a ("drm/i915/gen9: Only copy WM results for changed pipes to skl_hw")

from Linus' tree and commits:

2722efb90b34 ("drm/i915/gen9: Only copy WM results for changed pipes to skl_hw")
27082493e9c6 ("drm/i915/skl: Update DDB values atomically with wms/plane attrs")

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