linux-next: build failure after merge of the crc and sound trees

[Stephen Rothwell]

Hi all,

After merging the crc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from lib/gen_crc32table.c:5:
lib/crc32defs.h:13:10: warning: "CRC_LE_BITS" redefined
   13 | # define CRC_LE_BITS 8
      |          ^~~~~~~~~~~
lib/crc32defs.h:5:10: note: this is the location of the previous definition
    5 | # define CRC_LE_BITS 64
      |          ^~~~~~~~~~~
lib/crc32defs.h:14:10: warning: "CRC_BE_BITS" redefined
   14 | # define CRC_BE_BITS 8
      |          ^~~~~~~~~~~
lib/crc32defs.h:6:10: note: this is the location of the previous definition
    6 | # define CRC_BE_BITS 64
      |          ^~~~~~~~~~~
In file included from lib/crc32.c:34:
lib/crc32defs.h:13:10: error: "CRC_LE_BITS" redefined [-Werror]
   13 | # define CRC_LE_BITS 8
      |          ^~~~~~~~~~~
lib/crc32defs.h:5:10: note: this is the location of the previous definition
    5 | # define CRC_LE_BITS 64
      |          ^~~~~~~~~~~
lib/crc32defs.h:14:10: error: "CRC_BE_BITS" redefined [-Werror]
   14 | # define CRC_BE_BITS 8
      |          ^~~~~~~~~~~
lib/crc32defs.h:6:10: note: this is the location of the previous definition
    6 | # define CRC_BE_BITS 64
      |          ^~~~~~~~~~~
cc1: all warnings being treated as errors

Probably caused by commit

  bb5f86ea50ff ("ALSA: hda/tas2781: Add tas2781 hda SPI driver")

from the sound tree - it selects CRC32_SARWATE.

$ grep CONFIG_CRC32_ .config
CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y
# CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set
# CONFIG_CRC32_IMPL_SLICEBY8 is not set
# CONFIG_CRC32_IMPL_SLICEBY4 is not set
# CONFIG_CRC32_IMPL_SLICEBY1 is not set
# CONFIG_CRC32_IMPL_BIT is not set
CONFIG_CRC32_ARCH=y
CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC32_SARWATE=y

It looks like lib/crc32defs.h does not expect these last 2 to be enabled
at the same time.

I have reverted the above sound tree commit for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpbYPTGQ7CJ1.pgp
Description: OpenPGP digital signature