Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 02:04:37 +0000 (13:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 02:04:37 +0000 (13:04 +1100)
commitd376cfa608b4b07f4e756a2bbabb6d264a9b1515
tree73a9c8d46e297225e99185ef2c7553f2e35b62dd
parent29d06870d5acf0a9166f28654967ed6c6b23d7f8
parent47f16fe53545289e2e90e59a1c4679c87e833cf9
Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel

# Conflicts:
# drivers/gpu/drm/dp/drm_dp.c
# drivers/gpu/drm/i915/display/intel_bw.c
# drivers/gpu/drm/i915/display/intel_snps_phy.c
drivers/gpu/drm/dp/drm_dp.c
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
include/drm/dp/drm_dp_helper.h