linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: linux-next: build failure after merge of the regulator tree
Date: Tue, 3 Sep 2019 14:26:38 +1000	[thread overview]
Message-ID: <20190903142638.79d2cc87@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 6467 bytes --]

Hi all,

After merging the regulator tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ld: drivers/ata/ahci.o:(.opd+0x150): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/ata/ahci.o: in function `.regulator_bulk_set_supply_names':
ahci.c:(.text+0x1780): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/ata/libahci.o: in function `.regulator_bulk_set_supply_names':
(.text+0x84a0): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/ata/libahci.o:(.opd+0x5d0): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/ata/sata_mv.o:(.opd+0x690): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/ata/sata_mv.o: in function `.regulator_bulk_set_supply_names':
sata_mv.c:(.text+0xb9b0): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/common/common.o: in function `.regulator_bulk_set_supply_names':
(.text+0x7d0): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/common/common.o:(.opd+0x120): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/core/usb.o: in function `.regulator_bulk_set_supply_names':
(.text+0x17d0): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/core/usb.o:(.opd+0x348): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/core/hub.o: in function `.regulator_bulk_set_supply_names':
(.text+0x2610): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/core/hub.o:(.opd+0x378): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/core/hcd.o: in function `.regulator_bulk_set_supply_names':
(.text+0x3020): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/core/hcd.o:(.opd+0x378): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/core/message.o: in function `.regulator_bulk_set_supply_names':
(.text+0x2350): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/core/message.o:(.opd+0x240): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/core/phy.o: in function `.regulator_bulk_set_supply_names':
(.text+0x700): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/core/phy.o:(.opd+0xc0): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/core/of.o: in function `.regulator_bulk_set_supply_names':
(.text+0x2f0): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/core/of.o:(.opd+0x48): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/phy/of.o: in function `.regulator_bulk_set_supply_names':
(.text+0x120): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/phy/of.o:(.opd+0x18): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/host/ehci-hcd.o: in function `.regulator_bulk_set_supply_names':
(.text+0x11830): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/host/ehci-hcd.o:(.opd+0x8d0): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/usb/host/ohci-hcd.o: in function `.regulator_bulk_set_supply_names':
(.text+0xe8d0): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/usb/host/ohci-hcd.o:(.opd+0x570): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here
ld: drivers/of/platform.o: in function `.regulator_bulk_set_supply_names':
(.text+0x1180): multiple definition of `.regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.text+0x2390): first defined here
ld: drivers/of/platform.o:(.opd+0x180): multiple definition of `regulator_bulk_set_supply_names'; drivers/phy/phy-core.o:(.opd+0x3f0): first defined here

Caused by commit

  d0087e72710c ("regulator: provide regulator_bulk_set_supply_names()")

I applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Sep 2019 14:23:17 +1000
Subject: [PATCH] regulator: stubs in header files should be static inline

Fixes: d0087e72710c ("regulator: provide regulator_bulk_set_supply_names()")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/regulator/consumer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 6d2181a76987..fe9bdf37c296 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -586,7 +586,7 @@ static inline int regulator_list_voltage(struct regulator *regulator, unsigned s
 	return -EINVAL;
 }
 
-void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
+static inline void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
 				     const char *const *supply_names,
 				     unsigned int num_supplies)
 {
-- 
2.23.0.rc1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-09-03  4:26 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-03  4:26 Stephen Rothwell [this message]
2019-09-03  6:46 ` linux-next: build failure after merge of the regulator tree Bartosz Golaszewski
  -- strict thread matches above, loose matches on Subject: below --
2022-07-07  3:01 Stephen Rothwell
2021-11-23  7:41 Stephen Rothwell
2021-11-23  8:33 ` Vaittinen, Matti
2021-11-23  9:26 ` Vaittinen, Matti
2021-11-23 14:17   ` Mark Brown
2021-10-22  1:53 Stephen Rothwell
2021-10-22 10:31 ` Alistair
2021-10-22 12:40   ` Mark Brown
2020-02-25 23:39 Stephen Rothwell
2019-08-29  3:57 Stephen Rothwell
2018-11-20  0:49 Stephen Rothwell
2018-11-20  0:56 ` Dmitry Osipenko
2017-02-01  2:42 Stephen Rothwell
2017-02-01 10:03 ` Mark Brown
2017-02-02 22:30   ` Stephen Rothwell
2017-02-03 11:31     ` Mark Brown
2015-04-09  4:33 Stephen Rothwell
2015-04-09  9:35 ` Mark Brown
2015-04-13 23:44   ` Stephen Rothwell
2015-04-14  1:07     ` Bjorn Andersson
2015-04-14  1:22       ` Stephen Rothwell
2015-04-14  9:40         ` Mark Brown
2015-04-15  3:03           ` Dave Airlie
2015-04-09 15:00 ` Rob Clark
2015-03-10  2:44 Stephen Rothwell
2015-03-10 10:40 ` Mark Brown
2014-09-08  8:33 Stephen Rothwell
2014-09-09 22:39 ` Mark Brown
2014-09-10  2:33   ` Chris Zhong
2014-09-10 10:54     ` Mark Brown
2014-09-10  2:50   ` Doug Anderson
2014-08-17 20:41 Stephen Rothwell
2014-07-08  3:10 Stephen Rothwell
2014-05-27  4:41 Stephen Rothwell
2014-01-06  6:37 Stephen Rothwell
2013-07-01  4:18 Stephen Rothwell
2013-07-01  6:07 ` Kishon Vijay Abraham I
2013-07-01  8:43   ` Mark Brown
2013-07-01  8:47     ` Kishon Vijay Abraham I
2013-07-01  8:42 ` Mark Brown
2012-09-10  3:20 Stephen Rothwell
2012-06-21  3:27 Stephen Rothwell
2012-06-21  8:13 ` Kim, Milo
2012-06-21  8:20   ` Axel Lin
2012-06-21  8:42     ` Kim, Milo
2012-06-21  9:14     ` Mark Brown
2012-06-21 11:04     ` Stephen Rothwell
2012-06-21 11:30       ` Mark Brown
2012-06-21 17:35       ` Andrew Morton
2012-06-21  9:46   ` Mark Brown
2012-06-20  4:50 Stephen Rothwell
2012-06-20  4:55 ` Axel Lin
2012-06-20 15:33   ` Stephen Warren
2012-04-10  3:01 Stephen Rothwell
2011-11-24  3:10 Stephen Rothwell
2011-11-24  7:31 ` Rajendra Nayak

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=20190903142638.79d2cc87@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bgolaszewski@baylibre.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.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).