From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vkoul@kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Angelo Dureghello <angelo@sysam.it>
Subject: linux-next: build failure after merge of the slave-dma tree
Date: Thu, 4 Oct 2018 15:44:38 +1000 [thread overview]
Message-ID: <20181004154438.64f9d8c2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
Hi Vinod,
After merging the slave-dma tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/dma/fsl-edma.c:67: warning: "EDMA_SEEI_SEEI" redefined
#define EDMA_SEEI_SEEI(x) ((x) & 0x1F)
In file included from drivers/dma/fsl-edma.c:25:
drivers/dma/fsl-edma-common.h:21: note: this is the location of the previous definition
#define EDMA_SEEI_SEEI(x) ((x) & GENMASK(4, 0))
...
drivers/dma/fsl-edma.c:115:6: error: nested redefinition of 'enum fsl_edma_pm_state'
enum fsl_edma_pm_state {
^~~~~~~~~~~~~~~~~
drivers/dma/fsl-edma.c:115:6: error: redeclaration of 'enum fsl_edma_pm_state'
In file included from drivers/dma/fsl-edma.c:25:
drivers/dma/fsl-edma-common.h:63:6: note: originally defined here
enum fsl_edma_pm_state {
^~~~~~~~~~~~~~~~~
and so on ...
Caused by commit
101d256a45ed ("Merge branch 'testing/dirn_remove' into next")
which reintroduced a whole lot of stuff into drivers/dma/fsl-edma.c that
had been modev out in commit
9d831528a656 ("dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended)")
I used the slave-dma tree from next-20181003 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-10-04 5:44 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 5:44 Stephen Rothwell [this message]
2018-10-04 6:13 ` linux-next: build failure after merge of the slave-dma tree Vinod
-- strict thread matches above, loose matches on Subject: below --
2019-07-04 7:31 Stephen Rothwell
2019-07-06 13:43 ` Robin Gong
2019-07-06 14:43 ` Vinod Koul
2019-07-08 2:01 ` Robin Gong
2019-07-08 4:09 ` Vinod Koul
2019-07-08 1:22 ` Robin Gong
2019-07-08 3:06 ` zhangfei
2019-07-08 4:17 ` Vinod Koul
2019-07-08 4:54 ` Robin Gong
2019-07-08 4:48 ` Robin Gong
2017-08-22 5:36 Stephen Rothwell
2017-08-22 16:39 ` Vinod Koul
2016-09-16 3:18 Stephen Rothwell
2016-09-16 8:34 ` Peter Griffin
2016-09-19 16:38 ` Vinod Koul
2015-10-15 0:51 Stephen Rothwell
2015-10-15 3:35 ` Koul, Vinod
2015-10-15 3:51 ` Stephen Rothwell
2015-10-15 14:07 ` Arnd Bergmann
2015-10-15 14:27 ` Stephen Rothwell
2015-08-06 2:22 Stephen Rothwell
2015-08-06 3:00 ` Vinod Koul
2015-08-24 6:53 ` Maxime Ripard
2015-08-24 8:11 ` Vinod Koul
2015-08-24 9:21 ` Maxime Ripard
2015-02-16 1:09 Stephen Rothwell
2015-02-16 1:48 ` Yibin Gong
2015-02-16 4:06 ` Vinod Koul
2014-12-09 3:48 Stephen Rothwell
2014-12-09 4:47 ` Vinod Koul
2014-11-10 0:58 Stephen Rothwell
2014-11-10 5:06 ` Vinod Koul
2014-11-12 13:23 ` Ludovic Desroches
2014-09-12 3:17 Stephen Rothwell
2014-09-15 9:51 ` Geert Uytterhoeven
2014-07-28 2:18 Stephen Rothwell
2014-07-28 7:16 ` Vinod Koul
2014-07-28 11:56 ` Maxime Ripard
2013-04-02 1:57 Stephen Rothwell
2013-04-02 1:38 ` Vinod Koul
2013-01-07 0:26 Stephen Rothwell
2013-01-07 14:00 ` Vinod Koul
2012-06-22 3:00 Stephen Rothwell
2012-06-22 5:01 ` Vinod Koul
2012-06-25 1:21 ` Zhangfei Gao
2012-03-27 0:52 Stephen Rothwell
2012-03-27 8:33 ` Vinod Koul
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=20181004154438.64f9d8c2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=angelo@sysam.it \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=vkoul@kernel.org \
/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).