Merge drm/drm-next into drm-intel-gt-next
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 24 Jan 2023 16:23:03 +0000 (16:23 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 24 Jan 2023 16:23:03 +0000 (16:23 +0000)
commit9635adf8541ae9cbead19d769dce2c945fa88de6
treeacab90e8fb7c2e4c04a39d72d51a55bf8b1e8b8f
parent1ec23ed7126e6b8fab287598576e84e26e6482ef
parent045e8d102f44ad75dca0b0ec9eede15ea89da673
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>
drivers/gpu/drm/i915/i915_reg.h