Merge tag 'drm-intel-fixes-2023-07-20' of git://anongit.freedesktop.org/drm/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 21 Jul 2023 02:15:09 +0000 (12:15 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 21 Jul 2023 02:15:09 +0000 (12:15 +1000)
commit534a7915c6043c4abc3e4f44bc30576b361fa2e3
tree19e46535442dd069c76d954d47b3adbdad4a7b87
parentf4f19c03cfb99b587cf35ff057be97cb98c5d251
parent2c27770a7bc88ef7f6614d11d96d8e62017d0b78
Merge tag 'drm-intel-fixes-2023-07-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

- Add sentinel to xehp_oa_b_counters [perf] (Andrzej Hajda)
- Revert "drm/i915: use localized __diag_ignore_all() instead of per file" (Jani Nikula)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZLjuwhLhwab5B7RY@tursulin-desk