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

From: Stephen Rothwell
Date: Wed Jul 09 2014 - 00:06:28 EST

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_drv.h between commit 72f5fd2a9815
("drm/i915/vlv: T12 eDP panel timing enforcement during reboot") from
the drm-intel-fixes tree and commit 6118efe5968c ("drm/i915: move
psr_setup_done to psr struct") from the drm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/i915/intel_drv.h
index f67340ed2c12,5f7c7bd94d90..000000000000
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -537,9 -541,6 +541,8 @@@ struct intel_dp
unsigned long last_power_cycle;
unsigned long last_power_on;
unsigned long last_backlight_off;
- bool psr_setup_done;
+ struct notifier_block edp_notifier;
bool use_tps3;
struct intel_connector *attached_connector;

Attachment: signature.asc
Description: PGP signature