From: Dave Airlie Date: Sat, 18 Jan 2020 02:53:53 +0000 (+1000) Subject: Merge tag 'drm-intel-fixes-2020-01-16' of git://anongit.freedesktop.org/drm/drm-intel... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e33c7ba89263c4bf5d0553907f315dd38751e684;p=linux.git Merge tag 'drm-intel-fixes-2020-01-16' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes - uAPI fix: Remove dash and colon from PMU names to comply with tools/perf - Fix for include file that was indirectly included - Two fixes to make sure VMA are marked active for error capture Signed-off-by: Dave Airlie From: Joonas Lahtinen Link: https://patchwork.freedesktop.org/patch/msgid/20200116161419.GA13594@jlahtine-desk.ger.corp.intel.com --- e33c7ba89263c4bf5d0553907f315dd38751e684