From: Thierry Reding <treding@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Lucas Stach <dev@lynxeye.de>
Subject: Re: linux-next: build failure after merge of the mmc-uh tree
Date: Tue, 5 Jan 2016 17:30:52 +0100 [thread overview]
Message-ID: <20160105163051.GB7287@ulmo.nvidia.com> (raw)
In-Reply-To: <20151231145329.63b42c86@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]
On Thu, Dec 31, 2015 at 02:53:29PM +1100, Stephen Rothwell wrote:
> 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.
Sorry about this. I had meant to send this to Ulf as a pull request
before the Christmas break but then got side-tracked and never got
around to it.
I've now removed that branch from the Tegra tree.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-01-05 16:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 3:53 linux-next: build failure after merge of the mmc-uh tree Stephen Rothwell
2016-01-05 16:30 ` Thierry Reding [this message]
-- 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=20160105163051.GB7287@ulmo.nvidia.com \
--to=treding@nvidia.com \
--cc=ccross@android.com \
--cc=dev@lynxeye.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.com \
--cc=ulf.hansson@linaro.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).