Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm...
authorDave Airlie <airlied@redhat.com>
Tue, 7 Nov 2017 19:22:49 +0000 (05:22 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 7 Nov 2017 19:22:49 +0000 (05:22 +1000)
commitd65d31388a23b14df9494135ad6c6549a59a3caa
tree8b0f65597ab7b04af4d215df3a5e770a347c98f2
parent8a6fb5b5823d863b07f670dc9e791d4622d5b7e9
parente073db5c5d7ad311efa8f4192a2047b006bbc5f3
Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Fixes for 4.15 merge window:

Just the cherry-picked vc4 fix plus a GFP_NOFAIL annotation (there's
apparently some new options in-flight to change/audit
too-small-to-fail kmalloc semantics or something like that).

* tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/vc4: Fix wrong printk format in vc4_bo_stats_debugfs()
  drm: Require __GFP_NOFAIL for the legacy drm_modeset_lock_all