linux-kernel - linux-next: build failure after merge of the drm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20210409133619.69c135ff@canb.auug.org.au>
Date:   Fri, 9 Apr 2021 13:36:19 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>
Cc:     Imre Deak <imre.deak@...el.com>,
        Rodrigo Vivi <rodrigo.vivi@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the drm tree

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

Content of type "application/pgp-signature" skipped