Commit 97c484cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'crc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux 

Pull CRC cleanups from Eric Biggers:
 "Finish cleaning up the CRC kconfig options by removing the remaining
  unnecessary prompts and an unnecessary 'default y', removing
  CONFIG_LIBCRC32C, and documenting all the CRC library options"

* tag 'crc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crc: remove CONFIG_LIBCRC32C
  lib/crc: document all the CRC library kconfig options
  lib/crc: remove unnecessary prompt for CONFIG_CRC_ITU_T
  lib/crc: remove unnecessary prompt for CONFIG_CRC_T10DIF
  lib/crc: remove unnecessary prompt for CONFIG_CRC16
  lib/crc: remove unnecessary prompt for CONFIG_CRC_CCITT
  lib/crc: remove unnecessary prompt for CONFIG_CRC32 and drop 'default y'
parents 84ffc79b b261d222

arch/arm/configs/at91_dt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_DEV_ATMEL_AES=y

CONFIG_CRYPTO_DEV_ATMEL_TDES=y

CONFIG_CRYPTO_DEV_ATMEL_SHA=y

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_ACORN_8x8=y

arch/arm/configs/collie_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ CONFIG_ROMFS_FS=y 
CONFIG_NLS_DEFAULT="cp437"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_MINI_4x6=y

# CONFIG_DEBUG_BUGVERBOSE is not set

arch/arm/configs/davinci_all_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ CONFIG_NLS_ASCII=m 
CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC_T10DIF=m

CONFIG_DMA_CMA=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_RT_MUTEXES=y

arch/arm/configs/dove_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ CONFIG_CRYPTO_DEFLATE=y 
CONFIG_CRYPTO_LZO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_MARVELL_CESA=y

CONFIG_CRC_CCITT=y

CONFIG_PRINTK_TIME=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

arch/arm/configs/exynos_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ CONFIG_CRYPTO_AES_ARM_BS=m 
CONFIG_CRYPTO_CHACHA20_NEON=m

CONFIG_CRYPTO_DEV_EXYNOS_RNG=y

CONFIG_CRYPTO_DEV_S5P=y

CONFIG_CRC_CCITT=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=96

CONFIG_FONTS=y