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: 6+ 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-05-10 1:18 Stephen Rothwell
2023-05-10 2:26 ` Jakub Kicinski
2023-05-11 10:54 ` Ulf Hansson
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 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).