From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Ulf Hansson" <ulf.hansson@linaro.org>,
"David Miller" <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Pali Rohár" <pali@kernel.org>,
"Wright Feng" <wright.feng@cypress.com>,
"Chi-hsien Lin" <chi-hsien.lin@cypress.com>
Subject: Re: linux-next: build failure after merge of the mmc tree
Date: Tue, 02 Jun 2020 15:15:03 +0300 [thread overview]
Message-ID: <87a71lll4o.fsf@codeaurora.org> (raw)
In-Reply-To: <20200602134402.24c19488@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 2 Jun 2020 13:44:02 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> After merging the mmc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c: In function
> 'brcmf_sdiod_probe':
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7:
> error: 'SDIO_DEVICE_ID_CYPRESS_4373' undeclared (first use in this
> function); did you mean 'SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373'?
> 915 | case SDIO_DEVICE_ID_CYPRESS_4373:
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> | SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
> 1eb911258805 ("mmc: sdio: Fix Cypress SDIO IDs macros in common include file")
>
> interacting with commit
>
> 2a7621ded321 ("brcmfmac: set F2 blocksize for 4373")
>
> from the net-next tree.
>
> I have applied the following merge fix patch.
Looks good to me, thanks. Ulf, I guess you will notify Linus about the
conflict in your pull request?
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2020-06-02 12:15 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 3:44 linux-next: build failure after merge of the mmc tree Stephen Rothwell
2020-06-02 12:05 ` Ulf Hansson
2020-06-02 12:15 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-09 1:34 Stephen Rothwell
2023-06-09 6:10 ` Wenbin Mei (梅文彬)
2023-05-10 1:18 Stephen Rothwell
2023-05-10 2:26 ` Jakub Kicinski
2023-05-11 10:54 ` Ulf Hansson
2021-04-16 3:48 Stephen Rothwell
2021-04-16 3:49 ` Stephen Rothwell
2021-04-26 1:31 ` Stephen Rothwell
2021-04-26 9:46 ` Ulf Hansson
2020-10-06 5:29 Stephen Rothwell
2020-09-25 4:40 Stephen Rothwell
2020-05-18 4:27 Stephen Rothwell
2020-05-18 6:10 ` Martin Blumenstingl
2018-02-15 0:49 Stephen Rothwell
2018-02-15 5:29 ` Kishon Vijay Abraham I
2014-05-30 3:23 Stephen Rothwell
2014-06-02 9:31 ` Ulf Hansson
[not found] ` <20140602214039.10062.15077@quantum>
2014-06-02 21:43 ` Chris Ball
2014-05-26 4:07 Stephen Rothwell
2014-06-02 5:11 ` Stephen Rothwell
2014-06-03 22:52 ` Stephen Rothwell
2014-06-04 19:21 ` Chris Ball
2014-06-05 2:57 ` Chris Ball
2014-05-23 5:32 Stephen Rothwell
2014-05-23 8:45 ` Sebastian Hesselbarth
2014-04-22 3:06 Stephen Rothwell
2014-04-22 4:57 ` Seungwon Jeon
2014-04-22 8:40 ` Ulf Hansson
2014-04-22 11:10 ` Chris Ball
2014-04-22 11:10 ` Chris Ball
2013-12-13 1:57 Stephen Rothwell
2013-12-17 2:28 ` Stephen Rothwell
2013-12-17 3:07 ` Dong Aisheng
2013-12-17 3:16 ` Shawn Guo
2013-12-17 3:16 ` Shawn Guo
2013-12-17 8:06 ` Dong Aisheng
2014-01-06 6:22 ` Stephen Rothwell
2014-01-06 6:30 ` Dong Aisheng
2014-01-06 6:46 ` Shawn Guo
2014-01-06 6:46 ` Shawn Guo
2014-01-06 6:46 ` Dong Aisheng
2014-01-06 6:30 ` Shawn Guo
2014-01-06 6:30 ` Shawn Guo
2014-01-06 6:44 ` Shawn Guo
2014-01-06 6:44 ` Shawn Guo
2014-01-06 7:29 ` Stephen Rothwell
2014-01-06 7:29 ` Stephen Rothwell
2014-01-07 3:27 ` Stephen Rothwell
2014-01-07 3:27 ` Stephen Rothwell
2014-01-13 17:49 ` Chris Ball
2014-01-13 17:49 ` Chris Ball
2013-12-23 1:40 ` Stephen Rothwell
2011-11-09 1:06 Stephen Rothwell
2011-11-09 1:35 ` Chris Ball
2011-09-22 6:13 Stephen Rothwell
2011-09-22 11:56 ` Chris Ball
2011-07-16 9:30 Stephen Rothwell
2011-07-18 22:29 ` Per Forlin
2011-03-28 2:10 Stephen Rothwell
2010-10-25 1:12 Stephen Rothwell
2010-10-25 2:21 ` Chris Ball
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=87a71lll4o.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=chi-hsien.lin@cypress.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pali@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=ulf.hansson@linaro.org \
--cc=wright.feng@cypress.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.