diff options
author | Dave Airlie <airlied@redhat.com> | 2020-01-18 12:53:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-01-18 12:53:54 +1000 |
commit | e33c7ba89263c4bf5d0553907f315dd38751e684 (patch) | |
tree | 3feb1835f8c18717514bb39036e336e10e2921d0 /include | |
parent | Merge tag 'amd-drm-fixes-5.5-2020-01-15' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (diff) | |
parent | drm/i915/pmu: Do not use colons or dashes in PMU names (diff) | |
download | wireguard-linux-e33c7ba89263c4bf5d0553907f315dd38751e684.tar.xz wireguard-linux-e33c7ba89263c4bf5d0553907f315dd38751e684.zip |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions