linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell
Date: Thu Jul 28 2016 - 21:45:48 EST
Today's linux-next merge of the drm tree got a conflict in:
194dc870a589 ("Add braces to avoid "ambiguous âelseâ" compiler warnings")
from Linus' tree and commit:
24f1d3cc0997 ("drm/i915: Refactor execlists default context pinning")
from the drm tree.
I fixed it up (I just used the version from the drm tree) 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.