]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'drm-intel-fixes-2020-01-16' of git://anongit.freedesktop.org/drm/drm-intel...
authorDave Airlie <airlied@redhat.com>
Sat, 18 Jan 2020 02:53:53 +0000 (12:53 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 18 Jan 2020 02:53:54 +0000 (12:53 +1000)
commite33c7ba89263c4bf5d0553907f315dd38751e684
tree3feb1835f8c18717514bb39036e336e10e2921d0
parent16a89856f0a5d9235961d8d31432c76d650f8c1d
parent88550e1c345c6d3f70292fa60d481eb320e11953
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 <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200116161419.GA13594@jlahtine-desk.ger.corp.intel.com