Hi all, After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_pltfm_register': (.opd+0xd8): multiple definition of `sdhci_pltfm_register' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0xd8): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_pltfm_init': (.text+0x568): multiple definition of `.sdhci_pltfm_init' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x568): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_get_of_property': (.text+0x34c): multiple definition of `.sdhci_get_of_property' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x34c): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_be32bs_writel': (.text+0x13c): multiple definition of `.sdhci_be32bs_writel' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x13c): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_pltfm_resume': (.opd+0x120): multiple definition of `sdhci_pltfm_resume' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x120): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_be32bs_readl': (.opd+0x0): multiple definition of `sdhci_be32bs_readl' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_be32bs_readw': (.text+0x64): multiple definition of `.sdhci_be32bs_readw' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x64): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_pltfm_free': (.text+0x8d0): multiple definition of `.sdhci_pltfm_free' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x8d0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_pltfm_free': (.opd+0xc0): multiple definition of `sdhci_pltfm_free' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0xc0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_be32bs_readw': (.opd+0x18): multiple definition of `sdhci_be32bs_readw' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x18): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_pltfm_unregister': (.text+0xa94): multiple definition of `.sdhci_pltfm_unregister' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0xa94): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_be32bs_readb': (.text+0xd0): multiple definition of `.sdhci_be32bs_readb' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0xd0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_be32bs_writew': (.text+0x1a0): multiple definition of `.sdhci_be32bs_writew' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x1a0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_be32bs_writel': (.opd+0x48): multiple definition of `sdhci_be32bs_writel' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x48): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_pltfm_unregister': (.opd+0xf0): multiple definition of `sdhci_pltfm_unregister' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0xf0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_be32bs_writew': (.opd+0x60): multiple definition of `sdhci_be32bs_writew' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x60): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_pltfm_resume': (.text+0xc70): multiple definition of `.sdhci_pltfm_resume' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0xc70): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_be32bs_writeb': (.text+0x2ac): multiple definition of `.sdhci_be32bs_writeb' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x2ac): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_pltfm_suspend': (.text+0xc04): multiple definition of `.sdhci_pltfm_suspend' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0xc04): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_pltfm_register': (.text+0x9c0): multiple definition of `.sdhci_pltfm_register' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x9c0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `.sdhci_be32bs_readl': (.text+0x0): multiple definition of `.sdhci_be32bs_readl' drivers/mmc/host/sdhci-of-esdhc.o:(.text+0x0): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_be32bs_writeb': (.opd+0x78): multiple definition of `sdhci_be32bs_writeb' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x78): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_pltfm_suspend': (.opd+0x108): multiple definition of `sdhci_pltfm_suspend' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x108): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_get_of_property': (.opd+0x90): multiple definition of `sdhci_get_of_property' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x90): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_pltfm_init': (.opd+0xa8): multiple definition of `sdhci_pltfm_init' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0xa8): first defined here drivers/mmc/host/sdhci-of-hlwd.o: In function `sdhci_be32bs_readb': (.opd+0x30): multiple definition of `sdhci_be32bs_readb' drivers/mmc/host/sdhci-of-esdhc.o:(.opd+0x30): first defined here Presumably caused by commit e2d0d7dc5542 ("mmc: sdhci: make sdhci-of device drivers self registered"). I have reverted the merge of the mmc tree for today. P.S. Chris, some commits in your tree have no SoB from you despite the fact that you committed them. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpzSuJFhqHdc.pgp
Description: PGP signature