Re: linux-next: build failure after merge of the mmc tree

Stephen Rothwell [off-list ref] 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