linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell
Date: Tue Apr 07 2015 - 01:23:08 EST
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_sprite.c between commit 840a1cf0cd53
("drm/i915: Reject the colorkey ioctls for primary and cursor planes")
from Linus' tree and commit a8265c59e22a ("drm/i915: Rip out
GET_SPRITE_COLORKEY ioctl") from the drm tree.
I fixed it up (The latter removed some of the code modified by the
former) and can carry the fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: OpenPGP digital signature