Merge remote-tracking branch 'bluetooth/master'

diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
index 7ffd7b570b54d3413443dd736425b2259253618f,7ffd7b570b54d3413443dd736425b2259253618f..538682f882b16e98d8817281df1dbee758a88db0
--- 1/drivers/gpu/drm/i915/display/skl_universal_plane.c
--- 2/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@@ -1082,7 -1082,7 +1082,6 @@@ static int skl_plane_check_fb(const str
        struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
        const struct drm_framebuffer *fb = plane_state->hw.fb;
        unsigned int rotation = plane_state->hw.rotation;
--      struct drm_format_name_buf format_name;
  
        if (!fb)
                return 0;
@@@ -1130,9 -1130,9 +1129,8 @@@
                case DRM_FORMAT_XVYU12_16161616:
                case DRM_FORMAT_XVYU16161616:
                        drm_dbg_kms(&dev_priv->drm,
--                                  "Unsupported pixel format %s for 90/270!\n",
--                                  drm_get_format_name(fb->format->format,
--                                                      &format_name));
++                                  "Unsupported pixel format %p4cc for 90/270!\n",
++                                  &fb->format->format);
                        return -EINVAL;
                default:
                        break;