public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Manivannan Sadhasivam <manivannan.sadhasivam@linaro•org>
Cc: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the mhi tree
Date: Mon, 9 Aug 2021 19:38:37 +1000	[thread overview]
Message-ID: <20210809193837.373a9f68@canb.auug.org.au> (raw)

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

Hi all,

After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/bus/mhi/pci_generic.c:406:40: error: redefinition of 'mhi_mv31_channels'
  406 | static const struct mhi_channel_config mhi_mv31_channels[] = {
      |                                        ^~~~~~~~~~~~~~~~~
drivers/bus/mhi/pci_generic.c:372:40: note: previous definition of 'mhi_mv31_channels' was here
  372 | static const struct mhi_channel_config mhi_mv31_channels[] = {
      |                                        ^~~~~~~~~~~~~~~~~
drivers/bus/mhi/pci_generic.c:417:32: error: redefinition of 'mhi_mv31_events'
  417 | static struct mhi_event_config mhi_mv31_events[] = {
      |                                ^~~~~~~~~~~~~~~
drivers/bus/mhi/pci_generic.c:383:32: note: previous definition of 'mhi_mv31_events' was here
  383 | static struct mhi_event_config mhi_mv31_events[] = {
      |                                ^~~~~~~~~~~~~~~
drivers/bus/mhi/pci_generic.c:424:43: error: redefinition of 'modem_mv31_config'
  424 | static const struct mhi_controller_config modem_mv31_config = {
      |                                           ^~~~~~~~~~~~~~~~~
drivers/bus/mhi/pci_generic.c:390:43: note: previous definition of 'modem_mv31_config' was here
  390 | static const struct mhi_controller_config modem_mv31_config = {
      |                                           ^~~~~~~~~~~~~~~~~
drivers/bus/mhi/pci_generic.c:433:38: error: redefinition of 'mhi_mv31_info'
  433 | static const struct mhi_pci_dev_info mhi_mv31_info = {
      |                                      ^~~~~~~~~~~~~
drivers/bus/mhi/pci_generic.c:399:38: note: previous definition of 'mhi_mv31_info' was here
  399 | static const struct mhi_pci_dev_info mhi_mv31_info = {
      |                                      ^~~~~~~~~~~~~

Caused by an newer version (but almost identical) of all the mhi tree
commits are also now in the char-misc tree (almos identical patches,
but different commits.

I have dropped the mhi tree for today (please clean it up).

-- 
Cheers,
Stephen Rothwell

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

             reply	other threads:[~2021-08-09  9:38 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-09  9:38 Stephen Rothwell [this message]
2021-08-09  9:55 ` linux-next: build failure after merge of the mhi tree Manivannan Sadhasivam
  -- strict thread matches above, loose matches on Subject: below --
2022-11-09  4:16 Stephen Rothwell
2022-11-09  7:42 ` Manivannan Sadhasivam
2022-03-02  6:37 Stephen Rothwell
2022-03-02  6:48 ` Manivannan Sadhasivam
2020-11-17  4:12 Stephen Rothwell
2020-11-17  4:23 ` Manivannan Sadhasivam
2020-11-17  4:28   ` Manivannan Sadhasivam
2020-11-17  9:15     ` Kalle Valo
2020-11-18  4:39   ` Stephen Rothwell
2020-11-18  4:45     ` Stephen Rothwell
2020-11-18  4:51       ` Stephen Rothwell
2020-11-18  5:06         ` Manivannan Sadhasivam
2020-11-18  9:39           ` Manivannan Sadhasivam
2020-11-18 10:41             ` Stephen Rothwell
2020-09-28  8:42 Stephen Rothwell
2020-09-28  9:10 ` Manivannan Sadhasivam
2020-09-28  9:28   ` Stephen Rothwell
2020-09-28  9:34   ` Kalle Valo
2020-09-28  9:47     ` Manivannan Sadhasivam
2020-09-28 16:45       ` Kalle Valo
2020-09-28 17:04         ` Manivannan Sadhasivam
2020-09-29  6:18           ` Kalle Valo
2020-09-29 15:35 ` Manivannan Sadhasivam
2020-08-19  3:48 Stephen Rothwell
2020-08-19  3:49 ` Stephen Rothwell
2020-08-19  4:04 ` Manivannan Sadhasivam
2020-08-19  5:14   ` Stephen Rothwell

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=20210809193837.373a9f68@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=arnd@arndb$(echo .)de \
    --cc=greg@kroah$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=manivannan.sadhasivam@linaro$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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