Commit 2361d384 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.0-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "Fix a boot performance regression due to an unnecessary dependency on
  XOR_BLOCKS"

* tag 'v6.0-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: lib - remove unneeded selection of XOR_BLOCKS
parents 9c9d1896 874b3019

lib/crypto/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA 


config CRYPTO_LIB_CHACHA_GENERIC

	tristate

	select XOR_BLOCKS

	help

	  This symbol can be depended upon by arch implementations of the

	  ChaCha library interface that require the generic code as a