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. From: Stephen Rothwell Date: Tue, 2 Jun 2020 13:41:04 +1000 Subject: [PATCH] mmc: sdio: merge fix for "brcmfmac: set F2 blocksize for 4373" Signed-off-by: Stephen Rothwell --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index e718bd466830..46346cb3bc84 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -912,7 +912,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev) goto out; } switch (sdiodev->func2->device) { - case SDIO_DEVICE_ID_CYPRESS_4373: + case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373: f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE; break; case SDIO_DEVICE_ID_BROADCOM_4359: -- 2.26.2 -- Cheers, Stephen Rothwell