linux-next: build failure after merge of the bluetooth tree

[Stephen Rothwell]

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arm-linux-gnueabi-ld: net/bluetooth/hci_event.o: in function `msft_suspend':
hci_event.c:(.text+0x6e60): multiple definition of `msft_suspend'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x36fc): first defined here
arm-linux-gnueabi-ld: net/bluetooth/hci_event.o: in function `msft_resume':
hci_event.c:(.text+0x6e64): multiple definition of `msft_resume'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x3700): first defined here
arm-linux-gnueabi-ld: net/bluetooth/mgmt.o: in function `msft_suspend':
mgmt.c:(.text+0xd188): multiple definition of `msft_suspend'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x36fc): first defined here
arm-linux-gnueabi-ld: net/bluetooth/mgmt.o: in function `msft_resume':
mgmt.c:(.text+0xd18c): multiple definition of `msft_resume'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x3700): first defined here
arm-linux-gnueabi-ld: net/bluetooth/hci_request.o: in function `msft_suspend':
hci_request.c:(.text+0x2d0): multiple definition of `msft_suspend'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x36fc): first defined here
arm-linux-gnueabi-ld: net/bluetooth/hci_request.o: in function `msft_resume':
hci_request.c:(.text+0x2d4): multiple definition of `msft_resume'; net/bluetooth/hci_core.o:hci_core.c:(.text+0x3700): first defined here

Caused by commit

  47cb49448039 ("Bluetooth: Fix Advertisement Monitor Suspend/Resume")

# CONFIG_BT_MSFTEXT is not set

Forgot the "static inline"?

I have used the bluetooth tree from next-20210924 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpNYgNcw8PwE.pgp
Description: OpenPGP digital signature