Hi all,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/i915/display/intel_dp_link_training.c:43:13: error: redefinition of 'intel_dp_reset_lttpr_common_caps'
43 | static void intel_dp_reset_lttpr_common_caps(struct intel_dp *intel_dp)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_dp_link_training.c:38:13: note: previous definition of 'intel_dp_reset_lttpr_common_caps' was here
38 | static void intel_dp_reset_lttpr_common_caps(struct intel_dp *intel_dp)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_dp_link_training.c:38:13: warning: 'intel_dp_reset_lttpr_common_caps' defined but not used [-Wunused-function]
Caused by commit
9976ff61f045 ("Merge remote-tracking branch 'drm/drm-next'")
Because commit
7dffbdedb96a ("drm/i915: Disable LTTPR support when the DPCD rev < 1.4")
from Linus' tree and commit
264613b406eb ("drm/i915: Disable LTTPR support when the DPCD rev < 1.4")
from the drm tree are the same patch, git added the funtion twice :-(
I have applied a merge fix patch removing the second copy.
--
Cheers,
Stephen Rothwell
Attachment:
pgpxJeU9rTQiZ.pgp
Description: OpenPGP digital signature
