From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date: Tue, 24 Jan 2023 16:23:03 +0000 (+0000)
Subject: Merge drm/drm-next into drm-intel-gt-next
X-Git-Tag: ceph-for-6.4-rc1~384^2~9^2~23
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9635adf8541ae9cbead19d769dce2c945fa88de6;p=ceph-client.git

Merge drm/drm-next into drm-intel-gt-next

Lets eradicate a silent conflict between drm-intel-next and
drm-intel-gt-next which added a duplicate function (try_firmware_load).

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---

9635adf8541ae9cbead19d769dce2c945fa88de6