Merge tag 'drm-misc-fixes-2018-07-13' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Sun, 15 Jul 2018 23:50:26 +0000 (09:50 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 15 Jul 2018 23:51:01 +0000 (09:51 +1000)
commit990187537be1136ccd739efa550780ca4ee1a100
tree86b956fa4809255342d260a45adf9e57e00ab741
parent2757de4c098616a3da29f149bd2b7f0842989830
parent3156b53c2e2fadafa1a16412a8791b38f94b5bdc
Merge tag 'drm-misc-fixes-2018-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Fixes for v4.18-rc5:
- Single fix for a build error when the driver is builtin,
  but the backend is a loadable module.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9c596cf5-3f24-070e-74f2-c59bfbaf68fa@linux.intel.com