From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752068AbcAEQbJ (ORCPT ); Tue, 5 Jan 2016 11:31:09 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:1428 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868AbcAEQbD (ORCPT ); Tue, 5 Jan 2016 11:31:03 -0500 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Tue, 05 Jan 2016 08:26:50 -0800 Date: Tue, 5 Jan 2016 17:30:52 +0100 From: Thierry Reding To: Stephen Rothwell CC: Ulf Hansson , Stephen Warren , Colin Cross , Olof Johansson , , , Lucas Stach Subject: Re: linux-next: build failure after merge of the mmc-uh tree Message-ID: <20160105163051.GB7287@ulmo.nvidia.com> References: <20151231145329.63b42c86@canb.auug.org.au> MIME-Version: 1.0 In-Reply-To: <20151231145329.63b42c86@canb.auug.org.au> User-Agent: Mutt/1.5.23+102 (2ca89bed6448) (2014-03-12) X-Originating-IP: [10.2.68.61] X-ClientProxiedBy: UKMAIL102.nvidia.com (10.26.138.15) To UKMAIL101.nvidia.com (10.26.138.13) Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uAKRQypu60I7Lcqm" Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --uAKRQypu60I7Lcqm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 31, 2015 at 02:53:29PM +1100, Stephen Rothwell wrote: > Hi Ulf, >=20 > After merging the mmc-uh tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: >=20 > drivers/mmc/host/sdhci-tegra.c:361:38: error: redefinition of 'sdhci_tegr= a210_pdata' > static const struct sdhci_pltfm_data sdhci_tegra210_pdata =3D { > ^ > drivers/mmc/host/sdhci-tegra.c:343:38: note: previous definition of 'sdhc= i_tegra210_pdata' was here > static const struct sdhci_pltfm_data sdhci_tegra210_pdata =3D { > ^ > drivers/mmc/host/sdhci-tegra.c:370:42: error: redefinition of 'soc_data_t= egra210' > static const struct sdhci_tegra_soc_data soc_data_tegra210 =3D { > ^ > 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 =3D { > ^ > drivers/mmc/host/sdhci-tegra.c:372:14: error: 'NVQUIRK_DISABLE_SDR50' und= eclared here (not in a function) > .nvquirks =3D NVQUIRK_DISABLE_SDR50 | > ^ > drivers/mmc/host/sdhci-tegra.c:373:7: error: 'NVQUIRK_DISABLE_DDR50' unde= clared here (not in a function) > NVQUIRK_DISABLE_DDR50 | > ^ > drivers/mmc/host/sdhci-tegra.c:374:7: error: 'NVQUIRK_DISABLE_SDR104' und= eclared here (not in a function) > NVQUIRK_DISABLE_SDR104, > ^ >=20 > Caused by patch >=20 > "mmc: tegra: Add Tegra210 support" >=20 > turning up in two trees (mmc-uh and tegra) as separate commits and then > further changes to this file in the mmc-uh tree. >=20 > 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 --uAKRQypu60I7Lcqm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWi++4AAoJEN0jrNd/PrOhXG0P/Rv/jkADYudiY2Y0UNF1tTSd CKlBm/qDl00BcLPt5Z2ps+Isgl1LpRwu7iDlw7l0p6+vq1DSxOxHyLNZ+sKJ0LMS l8eMEGhZN/X8MfMFoQ/DT6WG21cIaGSldHayrA282okIYufmPt9ftfypO2ZrwYbZ kyb5RSFweOuRyDjtSJdrBf1O68Y7wzkKaAOcLDtmlAQ9vfDKZ730Qw2T1wrXtROs 7uboO6hBV2daC+Tju2a+KiUBzqgezUhRpctcF1EckH5mwuDbJ7fFuW6O7j2xP5lI 79xIaKP4AzoMvprTBRl+GTNIA0Yq0uePN6Z14jk3xM1jfnfByMmFmDKiigmDfeqs JwqdDRq8WYtT0oYFOS/p3ArfABACJ3z3evE6qd26J2Yz01ix5F2i2QWPMJ/wd3iP wPx1Q1rvPfJSSFzU5mBNcu2VGJAbzO877ZJdZqt9lk2sDEfuW1UK0C6ssvgU4gQM qR9wKCGmC06iHstxRtioxj+X4LGlZs6LQVfxX5XH6dQZS33OvGIPIfQMELH89uR/ Pfth9aZxiGLwLmIauXEJIHLixFMrhtOZ+LrOFgY6KmvnaXa/KT9J1wLyN4hAol/h OzkIZAwbG4hz84cIBxAlfw2mZq79yM1XcBkLEjkxrnDEharRg5iLRaIEmN935GXf qa8+bj92cYC6FTF7A7LO =wb92 -----END PGP SIGNATURE----- --uAKRQypu60I7Lcqm--