From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro•org>,
Stephen Warren <swarren@nvidia•com>,
Colin Cross <ccross@android•com>, Olof Johansson <olof@lixom•net>,
Thierry Reding <treding@nvidia•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Lucas Stach <dev@lynxeye•de>
Subject: linux-next: build failure after merge of the mmc-uh tree
Date: Thu, 31 Dec 2015 14:53:29 +1100 [thread overview]
Message-ID: <20151231145329.63b42c86@canb.auug.org.au> (raw)
Hi Ulf,
After merging the mmc-uh tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/mmc/host/sdhci-tegra.c:361:38: error: redefinition of 'sdhci_tegra210_pdata'
static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
^
drivers/mmc/host/sdhci-tegra.c:343:38: note: previous definition of 'sdhci_tegra210_pdata' was here
static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
^
drivers/mmc/host/sdhci-tegra.c:370:42: error: redefinition of 'soc_data_tegra210'
static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
^
drivers/mmc/host/sdhci-tegra.c:354:42: note: previous definition of 'soc_data_tegra210' was here
static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
^
drivers/mmc/host/sdhci-tegra.c:372:14: error: 'NVQUIRK_DISABLE_SDR50' undeclared here (not in a function)
.nvquirks = NVQUIRK_DISABLE_SDR50 |
^
drivers/mmc/host/sdhci-tegra.c:373:7: error: 'NVQUIRK_DISABLE_DDR50' undeclared here (not in a function)
NVQUIRK_DISABLE_DDR50 |
^
drivers/mmc/host/sdhci-tegra.c:374:7: error: 'NVQUIRK_DISABLE_SDR104' undeclared here (not in a function)
NVQUIRK_DISABLE_SDR104,
^
Caused by patch
"mmc: tegra: Add Tegra210 support"
turning up in two trees (mmc-uh and tegra) as separate commits and then
further changes to this file in the mmc-uh tree.
I used the version of the file from the mmc-uh tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-12-31 3:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 3:53 Stephen Rothwell [this message]
2016-01-05 16:30 ` linux-next: build failure after merge of the mmc-uh tree Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2015-08-26 2:04 Stephen Rothwell
2014-07-28 4:46 Stephen Rothwell
2014-07-28 17:58 ` Sonny Rao
2014-08-04 13:44 ` Ulf Hansson
2014-08-08 3:25 ` Stephen Rothwell
2014-08-11 7:54 ` Ulf Hansson
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=20151231145329.63b42c86@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ccross@android$(echo .)com \
--cc=dev@lynxeye$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=swarren@nvidia$(echo .)com \
--cc=treding@nvidia$(echo .)com \
--cc=ulf.hansson@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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