Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-10 12:02:26 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-10 12:02:26 +0100
commit0ecf64781c17f9c7a8e2d6ba25d99fb360f8363a (patch)
treeb1ef9e346ab262dd1365fb0ad707cdefa6664255
parent2ff37cc61cdb07b6159054ee1496f6ffd7599533 (diff)
parentf12c54e10ca6471d548564aadb3d22fa08685eeb (diff)
Merge branch 'master-vanilla-configs' into linux-next
-rw-r--r--config/arm64/vanilla3
-rw-r--r--config/i386/vanilla3
-rw-r--r--config/ppc64/vanilla3
-rw-r--r--config/ppc64le/vanilla3
-rw-r--r--config/x86_64/vanilla3
5 files changed, 5 insertions, 10 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 47fe215c5a..91c82d1785 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.20.0-rc5 Kernel Configuration
+# Linux/arm64 4.20.0-rc6 Kernel Configuration
#
#
@@ -9394,7 +9394,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index d595e1998f..7369cbbc36 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.20.0-rc5 Kernel Configuration
+# Linux/i386 4.20.0-rc6 Kernel Configuration
#
#
@@ -8525,7 +8525,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index daa3c15de6..19547f589c 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc5 Kernel Configuration
+# Linux/powerpc 4.20.0-rc6 Kernel Configuration
#
#
@@ -6977,7 +6977,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 232a1c4091..cd50e63ba5 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc5 Kernel Configuration
+# Linux/powerpc 4.20.0-rc6 Kernel Configuration
#
#
@@ -6828,7 +6828,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 2c1bc475bf..887fbb518b 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.20.0-rc5 Kernel Configuration
+# Linux/x86_64 4.20.0-rc6 Kernel Configuration
#
#
@@ -8572,7 +8572,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m