From: Dave Airlie <airlied@redhat.com>
Date: Fri, 21 Jul 2023 02:15:09 +0000 (+1000)
Subject: Merge tag 'drm-intel-fixes-2023-07-20' of git://anongit.freedesktop.org/drm/drm-intel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=534a7915c6043c4abc3e4f44bc30576b361fa2e3;p=linux.git

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
---

534a7915c6043c4abc3e4f44bc30576b361fa2e3