You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts: crypto/Kconfig
This commit is contained in:
+1
-5
@@ -12,9 +12,7 @@ source "crypto/async_tx/Kconfig"
|
||||
#
|
||||
# Cryptographic API Configuration
|
||||
#
|
||||
menu "Cryptographic options"
|
||||
|
||||
config CRYPTO
|
||||
menuconfig CRYPTO
|
||||
bool "Cryptographic API"
|
||||
help
|
||||
This option provides the core Cryptographic API.
|
||||
@@ -473,5 +471,3 @@ config CRYPTO_TEST
|
||||
source "drivers/crypto/Kconfig"
|
||||
|
||||
endif # if CRYPTO
|
||||
|
||||
endmenu
|
||||
|
||||
Reference in New Issue
Block a user