From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: linux-next: build failure after merge of the drm tree
Date: Fri, 9 Apr 2021 13:36:19 +1000 [thread overview]
Message-ID: <20210409133619.69c135ff@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1240 bytes --]
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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2021-04-09 3:36 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 3:36 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-11 6:47 linux-next: build failure after merge of the drm tree Stephen Rothwell
2023-01-19 2:12 Stephen Rothwell
[not found] <20220930105434.111407-1-broonie@kernel.org>
2022-10-04 2:20 ` Stephen Rothwell
2022-10-04 2:24 ` David Airlie
2022-10-04 3:05 ` Stephen Rothwell
2022-10-04 11:39 ` Mark Brown
2022-10-05 15:30 ` Alex Deucher
2022-10-05 16:45 ` Hamza Mahfooz
2022-10-05 22:28 ` Stephen Rothwell
2022-10-06 8:12 ` Stephen Rothwell
2022-10-06 13:56 ` Alex Deucher
2022-10-06 16:52 ` Stephen Rothwell
2022-10-06 16:25 ` Hamza Mahfooz
2022-02-25 16:42 broonie
2022-02-28 3:46 ` Stephen Rothwell
2022-02-28 6:44 ` Hsin-Yi Wang
2022-02-28 6:48 ` Dave Airlie
2022-02-28 15:33 ` Robert Foss
2022-03-01 6:58 ` Dave Airlie
2021-08-20 2:33 Stephen Rothwell
2021-08-20 6:23 ` Masahiro Yamada
2021-09-01 21:50 ` Stephen Rothwell
2021-09-05 22:49 ` Stephen Rothwell
2021-09-06 7:34 ` Daniel Vetter
2021-09-08 3:13 ` Masahiro Yamada
2021-09-08 9:07 ` Daniel Vetter
2021-01-08 0:55 Stephen Rothwell
2021-01-08 1:25 ` Stephen Rothwell
2021-01-10 23:56 ` Stephen Rothwell
2021-01-18 0:59 ` Stephen Rothwell
2021-01-18 1:06 ` Dave Airlie
2021-01-20 12:12 ` Daniel Vetter
2021-01-20 20:44 ` Stephen Rothwell
2020-12-09 1:53 Stephen Rothwell
2020-09-28 3:54 Stephen Rothwell
[not found] ` <20200928060427.GA15041@lst.de>
2020-09-28 6:08 ` Dave Airlie
2020-09-28 10:15 ` Paul Cercueil
[not found] ` <20200928113415.GA555@lst.de>
2020-09-28 11:46 ` Paul Cercueil
[not found] ` <20200928121002.GA3219@lst.de>
2020-09-28 13:31 ` Paul Cercueil
[not found] ` <20200930090252.GA9357@lst.de>
2020-09-30 13:33 ` Paul Cercueil
[not found] ` <20200930161124.GA6859@lst.de>
2020-09-30 16:39 ` Paul Cercueil
[not found] ` <20200930164023.GA8645@lst.de>
2020-09-30 16:45 ` Paul Cercueil
2020-05-08 4:29 Stephen Rothwell
2019-11-05 2:54 Stephen Rothwell
2019-11-05 2:54 ` Stephen Rothwell
2019-10-10 0:22 Stephen Rothwell
2019-07-08 4:48 Stephen Rothwell
2019-04-26 2:17 Stephen Rothwell
2018-05-16 6:53 Stephen Rothwell
2018-05-16 8:09 ` Oded Gabbay
2018-05-17 5:00 ` Dave Airlie
2018-03-13 5:46 Stephen Rothwell
2018-01-02 1:48 Stephen Rothwell
2017-03-20 0:51 Stephen Rothwell
2017-03-20 8:03 ` Daniel Vetter
2017-03-20 8:05 ` Daniel Vetter
2016-07-15 3:40 Stephen Rothwell
2016-07-15 4:32 ` Sedat Dilek
2016-04-28 1:57 Stephen Rothwell
2016-04-28 8:11 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210409133619.69c135ff@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).