linux-next: manual merge of the drm-msm tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/dp/dp_display.c

between commit:

  afc9b8b6bab8 ("drm/msm/dp: signal audio plugged change at dp_pm_resume")

from Linus' tree and commit:

  26ae419cd9ec ("drm/msm/dp: add drm debug logs to dp_pm_resume/suspend")

from the drm-msm tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/msm/dp/dp_display.c
index 867388a399ad,419fd4a14cbf..000000000000
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@@ -1312,10 -1314,10 +1315,14 @@@ static int dp_pm_resume(struct device *
  	else
  		dp->dp_display.is_connected = false;
  
 +	dp_display_handle_plugged_change(g_dp_display,
 +				dp->dp_display.is_connected);
 +
 +
+ 	DRM_DEBUG_DP("After, sink_count=%d is_connected=%d core_inited=%d power_on=%d\n",
+ 			dp->link->sink_count, dp->dp_display.is_connected,
+ 			dp->core_initialized, dp_display->power_on);
+ 
  	mutex_unlock(&dp->event_mutex);
  
  	return 0;

Attachment: pgprTqwc0U3x7.pgp
Description: OpenPGP digital signature