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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_panel.c between commit 5bdebb183c97
("drm/sysfs: sort out minor and connector device object lifetimes") from
the drm tree and commit 752aa88a1e78 ("drm/i915: make backlight functions
take a connector") from the drm-intel tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/i915/intel_panel.c
index 09b2994c9b37,cad41ac330e8..000000000000
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@@ -726,7 -802,8 +802,8 @@@ int intel_panel_setup_backlight(struct 
  	}
  	dev_priv->backlight.device =
  		backlight_device_register("intel_backlight",
- 					  connector->kdev, dev,
 -					  &connector->kdev,
++					  connector->kdev,
+ 					  to_intel_connector(connector),
  					  &intel_panel_bl_ops, &props);
  
  	if (IS_ERR(dev_priv->backlight.device)) {

Attachment: pgp00000.pgp
Description: PGP signature