linux-next: manual merge of the drm-intel tree with Linus' tree
From: Stephen Rothwell
Date: Mon May 30 2016 - 21:06:38 EST
Today's linux-next merge of the drm-intel tree got a conflict in:
9bd18728a3f2 ("drm/i915: Ignore stale wm register values on resume on ilk-bdw (v2)")
from Linus' tree and commit:
e3d5457c7caa ("drm/i915: Ignore stale wm register values on resume on ilk-bdw (v2)")
from the drm-intel tree.
I fixed it up (I used teh 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.