From: Dave Airlie <airlied@redhat.com>
Date: Thu, 30 May 2024 22:32:58 +0000 (+1000)
Subject: Merge tag 'drm-xe-fixes-2024-05-30' of https://gitlab.freedesktop.org/drm/xe/kernel... 
X-Git-Tag: nvme-6.11-2024-07-08~114^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c301c3d2acb3eddcf79b9755633801f7c6d9e840;p=nvme.git

Merge tag 'drm-xe-fixes-2024-05-30' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes

Driver Changes:
- One pcode polling timeout change
- One fix for deadlocks for faulting VMs
- One error-path lock imbalance fix

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZlisNHzgoq9nVg6g@fedora
---

c301c3d2acb3eddcf79b9755633801f7c6d9e840