Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88a1b564 authored by James Morris's avatar James Morris
Browse files

Merge tag 'keys-next-20160303' of... 

Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
parents 58046025 4e8ae72a

arch/arm/configs/colibri_pxa270_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ CONFIG_DEBUG_USER=y 
CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_KEYS=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_SECURITY=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_SHA1=m

arch/arm/configs/iop13xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_NLS=y

CONFIG_DEBUG_USER=y

CONFIG_KEYS=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_LRW=y

CONFIG_CRYPTO_PCBC=m

arch/arm/configs/iop32x_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ CONFIG_DEBUG_USER=y 
CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL_UART_8250=y

CONFIG_KEYS=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_LRW=y

CONFIG_CRYPTO_PCBC=m

arch/arm/configs/trizeps4_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_FS=y

CONFIG_DEBUG_USER=y

CONFIG_KEYS=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_SECURITY=y

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_SHA256=m

arch/microblaze/configs/mmu_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -87,5 +87,4 @@ CONFIG_KGDB_KDB=y 
CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set