Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2018-12-10 07:05:25 +0100
committerMichal Kubecek <mkubecek@suse.cz>2018-12-10 07:05:50 +0100
commit93f10c3b2489d3f01add256642dbd496617149a8 (patch)
treedc28839914d4e63ca45311c0ae24a44ff52c43b5
parentfb5fd392fe5943aa5a9b149970e4b448a7465c5c (diff)
Update to 4.20-rc6
- Eliminated 1 patch - Refresh configs
-rw-r--r--config/arm64/default3
-rw-r--r--config/i386/debug1
-rw-r--r--config/i386/pae3
-rw-r--r--config/ppc64/debug1
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64le/debug1
-rw-r--r--config/ppc64le/default3
-rw-r--r--config/s390x/default3
-rw-r--r--config/s390x/zfcpdump3
-rw-r--r--config/x86_64/debug1
-rw-r--r--config/x86_64/default3
-rw-r--r--patches.rpmify/x86-build-Fix-compiler-support-check-for-CONFIG_RETP.patch64
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
14 files changed, 8 insertions, 84 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 96a633e46e..0eb1a33513 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -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
#
#
@@ -9351,7 +9351,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/debug b/config/i386/debug
index bd8e14a7f5..101f496301 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -7,7 +7,6 @@ CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_CACHEFILES_DEBUG=y
CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_CIFS_DEBUG2=y
-CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEST=m
CONFIG_DEBUG_GPIO=y
CONFIG_DEBUG_MUTEXES=y
diff --git a/config/i386/pae b/config/i386/pae
index fca7b43f98..6cdaa0b2b4 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -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
#
#
@@ -8519,7 +8519,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/debug b/config/ppc64/debug
index 34eb18e2d0..bd93cf8c1e 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -5,7 +5,6 @@ CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_CACHEFILES_DEBUG=y
CONFIG_CGROUP_DEBUG=y
CONFIG_CRYPTO_DEV_VMX_ENCRYPT=y
-CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEST=m
CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_RSEQ=y
diff --git a/config/ppc64/default b/config/ppc64/default
index e4f9061885..467f3cd3c1 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -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
#
#
@@ -6978,7 +6978,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/debug b/config/ppc64le/debug
index b8fe142f59..0f9b972c3e 100644
--- a/config/ppc64le/debug
+++ b/config/ppc64le/debug
@@ -4,7 +4,6 @@ CONFIG_B43_DEBUG=y
CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_CACHEFILES_DEBUG=y
CONFIG_CGROUP_DEBUG=y
-CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEST=m
CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_RSEQ=y
diff --git a/config/ppc64le/default b/config/ppc64le/default
index e18f90667b..05a5d66d5d 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -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/s390x/default b/config/s390x/default
index 1d8b90e4f9..8c9bb7be03 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc5 Kernel Configuration
+# Linux/s390 4.20.0-rc6 Kernel Configuration
#
#
@@ -3362,7 +3362,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_ZCRYPT=m
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 4c833c8068..59747696fa 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc5 Kernel Configuration
+# Linux/s390 4.20.0-rc6 Kernel Configuration
#
#
@@ -1240,7 +1240,6 @@ CONFIG_CRYPTO_JITTERENTROPY=y
# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
# CONFIG_CRYPTO_USER_API_RNG is not set
# CONFIG_CRYPTO_USER_API_AEAD is not set
-# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_HW is not set
#
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 84370bcca2..95073c5ded 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -8,7 +8,6 @@ CONFIG_BPF_KPROBE_OVERRIDE=y
CONFIG_CACHEFILES_DEBUG=y
CONFIG_CAN_DEBUG_DEVICES=y
CONFIG_CIFS_DEBUG2=y
-CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEST=m
CONFIG_DEBUG_GPIO=y
CONFIG_DEBUG_MUTEXES=y
diff --git a/config/x86_64/default b/config/x86_64/default
index f090232e8b..a79ae42e76 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -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
#
#
@@ -8567,7 +8567,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/patches.rpmify/x86-build-Fix-compiler-support-check-for-CONFIG_RETP.patch b/patches.rpmify/x86-build-Fix-compiler-support-check-for-CONFIG_RETP.patch
deleted file mode 100644
index 8457c5a4ae..0000000000
--- a/patches.rpmify/x86-build-Fix-compiler-support-check-for-CONFIG_RETP.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Masahiro Yamada <yamada.masahiro@socionext.com>
-Date: Wed, 5 Dec 2018 15:27:19 +0900
-Subject: x86/build: Fix compiler support check for CONFIG_RETPOLINE
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
-Git-commit: e739d919a0f5f6ac95cffe32489c9c03be538178
-Patch-mainline: Queued in subsystem maintainer repository
-References: KMP build
-
-It is troublesome to add a diagnostic like this to the Makefile
-parse stage because the top-level Makefile could be parsed with
-a stale include/config/auto.conf.
-
-Once you are hit by the error about non-retpoline compiler, the
-compilation still breaks even after disabling CONFIG_RETPOLINE.
-
-The easiest fix is to move this check to the "archprepare" like
-this commit did:
-
- 829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")
-
-Reported-by: Meelis Roos <mroos@linux.ee>
-Tested-by: Meelis Roos <mroos@linux.ee>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-Acked-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
-Cc: Borislav Petkov <bp@alien8.de>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Zhenzhong Duan <zhenzhong.duan@oracle.com>
-Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support")
-Link: http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masahiro@socionext.com
-Link: https://lkml.org/lkml/2018/12/4/206
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- arch/x86/Makefile | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -223,9 +223,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwin
-
- # Avoid indirect branches in kernel to deal with Spectre
- ifdef CONFIG_RETPOLINE
--ifeq ($(RETPOLINE_CFLAGS),)
-- $(error You are building kernel with non-retpoline compiler, please update your compiler.)
--endif
- KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
- endif
-
-@@ -303,6 +300,13 @@ ifndef CC_HAVE_ASM_GOTO
- @echo Compiler lacks asm-goto support.
- @exit 1
- endif
-+ifdef CONFIG_RETPOLINE
-+ifeq ($(RETPOLINE_CFLAGS),)
-+ @echo "You are building kernel with non-retpoline compiler." >&2
-+ @echo "Please update your compiler." >&2
-+ @false
-+endif
-+endif
-
- archclean:
- $(Q)rm -rf $(objtree)/arch/i386
diff --git a/rpm/config.sh b/rpm/config.sh
index 75501b4acd..e9bfe7a183 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc5
+SRCVERSION=4.20-rc6
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
diff --git a/series.conf b/series.conf
index adcf4e51e7..7fdc48b6a7 100644
--- a/series.conf
+++ b/series.conf
@@ -38,7 +38,6 @@
patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch
patches.rpmify/powerpc-boot-Fix-missing-crc32poly.h-when-building-w.patch
patches.rpmify/scripts-mkmakefile-honor-second-argument.patch
- patches.rpmify/x86-build-Fix-compiler-support-check-for-CONFIG_RETP.patch
########################################################
# kABI consistency patches