The following commit has been merged in the master branch:
commit f2f22aeecaa3d123fa413c63b779e2311180a088
Merge: 109f1b36a3c7f49805dd62d155b614d4be603b68
b261d2222063a9a8b9ec284244c285f2998ee01e
Author: Stephen Rothwell <[email protected]>
Date: Tue Apr 8 12:59:01 2025 +1000
Merge branch 'crc-next' of
git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git
diff --combined arch/powerpc/configs/skiroot_defconfig
index 3086c4a12d6de,6f436cb7d0c1e..2b71a6dc399e4
--- a/arch/powerpc/configs/skiroot_defconfig
+++ b/arch/powerpc/configs/skiroot_defconfig
@@@ -78,6 -78,7 +78,6 @@@ CONFIG_VIRTIO_BLK=
CONFIG_BLK_DEV_NVME=m
CONFIG_NVME_MULTIPATH=y
CONFIG_EEPROM_AT24=m
-# CONFIG_CXL is not set
# CONFIG_OCXL is not set
CONFIG_BLK_DEV_SD=m
CONFIG_BLK_DEV_SR=m
@@@ -278,8 -279,6 +278,6 @@@ CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY
# CONFIG_INTEGRITY is not set
CONFIG_LSM="yama,loadpin,safesetid,integrity"
# CONFIG_CRYPTO_HW is not set
- CONFIG_CRC16=y
- CONFIG_CRC_ITU_T=y
# CONFIG_XZ_DEC_X86 is not set
# CONFIG_XZ_DEC_IA64 is not set
# CONFIG_XZ_DEC_ARM is not set
diff --combined arch/sh/configs/se7712_defconfig
index 49a4961889dec,6b31be19b94fd..8770a72e6a631
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@@ -57,6 -57,7 +57,6 @@@ CONFIG_NET_SCH_TBF=
CONFIG_NET_SCH_GRED=y
CONFIG_NET_SCH_DSMARK=y
CONFIG_NET_SCH_NETEM=y
-CONFIG_NET_CLS_TCINDEX=y
CONFIG_NET_CLS_ROUTE4=y
CONFIG_NET_CLS_FW=y
CONFIG_MTD=y
@@@ -96,4 -97,3 +96,3 @@@ CONFIG_FRAME_POINTER=
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set
- CONFIG_CRC_CCITT=y
diff --combined arch/sh/configs/se7721_defconfig
index de293792db841,35f500699b1d7..b15c6406a0e87
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_defconfig
@@@ -56,6 -56,7 +56,6 @@@ CONFIG_NET_SCH_TBF=
CONFIG_NET_SCH_GRED=y
CONFIG_NET_SCH_DSMARK=y
CONFIG_NET_SCH_NETEM=y
-CONFIG_NET_CLS_TCINDEX=y
CONFIG_NET_CLS_ROUTE4=y
CONFIG_NET_CLS_FW=y
CONFIG_MTD=y
@@@ -122,4 -123,3 +122,3 @@@ CONFIG_DEBUG_KERNEL=
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
CONFIG_FRAME_POINTER=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
- CONFIG_CRC_CCITT=y
diff --combined arch/sh/configs/titan_defconfig
index 8e85f205d8f57,f3fad19b3059a..f022ada363b5b
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_defconfig
@@@ -119,6 -119,7 +119,6 @@@ CONFIG_NET_SCH_DSMARK=
CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
@@@ -264,4 -265,3 +264,3 @@@ CONFIG_CRYPTO_SERPENT=
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set
- CONFIG_CRC16=m
diff --combined drivers/md/Kconfig
index 06f809e70f153,2c26a02391cde..ddb37f6670de8
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@@ -139,7 -139,7 +139,7 @@@ config MD_RAID45
tristate "RAID-4/RAID-5/RAID-6 mode"
depends on BLK_DEV_MD
select RAID6_PQ
- select LIBCRC32C
+ select CRC32
select ASYNC_MEMCPY
select ASYNC_XOR
select ASYNC_PQ
@@@ -267,7 -267,6 +267,7 @@@ config DM_CRYP
depends on BLK_DEV_DM
depends on (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n)
depends on (TRUSTED_KEYS || TRUSTED_KEYS=n)
+ select CRC32
select CRYPTO
select CRYPTO_CBC
select CRYPTO_ESSIV
diff --combined fs/bcachefs/Kconfig
index bf1c94e51dd06,ea668dedb2608..adcf425a9b885
--- a/fs/bcachefs/Kconfig
+++ b/fs/bcachefs/Kconfig
@@@ -4,7 -4,7 +4,7 @@@ config BCACHEFS_F
depends on BLOCK
select EXPORTFS
select CLOSURES
- select LIBCRC32C
+ select CRC32
select CRC64
select FS_POSIX_ACL
select LZ4_COMPRESS
@@@ -26,7 -26,6 +26,7 @@@
select SRCU
select SYMBOLIC_ERRNAME
select MIN_HEAP
+ select XARRAY_MULTI
help
The bcachefs filesystem - a modern, copy on write filesystem, with
support for multiple devices, compression, checksumming, etc.
--
LinuxNextTracking
