]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ec23ed 045e8d1)
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)
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>
1  2 
drivers/gpu/drm/i915/i915_reg.h patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.