linux-next: build failure after merge of the mfd tree

[broonie@xxxxxxxxxx]

Hi all,

After merging the mfd tree, today's linux-next build (KCONFIG_NAME)
failed like this:

/tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:255:35: error: redefinition of 'sprd_pmic_spi_ids'
  255 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
      |                                   ^~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/mfd/sprd-sc27xx-spi.c:242:35: note: previous definition of 'sprd_pmic_spi_ids' was here
  242 | static const struct spi_device_id sprd_pmic_spi_ids[] = {
      |                                   ^~~~~~~~~~~~~~~~~

Caused by commit

  6fc90b92e9c7ef348 ("mfd: sprd: Add SPI device ID table")

I used the MFD tree from yesterday instead.