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

[broonie]

Hi all,

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

  drivers/gpu/drm/i915/display/intel_snps_phy.c

between commit:

  28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error")

from the drm-intel-fixes tree and commit:

  c5274e86da5fe ("drm/i915/snps: convert to drm device based logging")

from the drm 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.

diff --cc drivers/gpu/drm/i915/display/intel_snps_phy.c
index 92ff654f54f56,8573a458811a0..0000000000000
--- a/drivers/gpu/drm/i915/display/intel_snps_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c
@@@ -28,13 -29,13 +29,13 @@@ void intel_snps_phy_wait_for_calibratio
        enum phy phy;
  
        for_each_phy_masked(phy, ~0) {
-               if (!intel_phy_is_snps(dev_priv, phy))
+               if (!intel_phy_is_snps(i915, phy))
                        continue;
  
-               if (intel_de_wait_for_clear(dev_priv, ICL_PHY_MISC(phy),
+               if (intel_de_wait_for_clear(i915, ICL_PHY_MISC(phy),
                                            DG2_PHY_DP_TX_ACK_MASK, 25))
-                       DRM_ERROR("SNPS PHY %c failed to calibrate after 
25ms.\n",
-                                 phy_name(phy));
+                       drm_err(&i915->drm, "SNPS PHY %c failed to calibrate 
after 25ms.\n",
 -                              phy);
++                              phy_name(phy));
        }
  }