Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/220'
Browse files Browse the repository at this point in the history
* origin/pr/220:
  Update to kernel-5.6.16
  • Loading branch information
marmarek committed Jun 7, 2020
2 parents 42f2ca7 + 3f84ef9 commit 6625849
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
15 changes: 4 additions & 11 deletions config-base
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Base config based on Fedora's config (kernel-core-5.6.14-300.fc32.x86_64.rpm)
# Base config based on Fedora's config (kernel-core-5.6.15-300.fc32.x86_64.rpm)
# Only modification is `yes '' | make oldconfig` to drop config settings which
# depend on Fedora patches and adjust for the small version difference.

#
# Compiler: gcc (GCC) 9.3.1 20200317 (Red Hat 9.3.1-1)
# Compiler: gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2)
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90301
Expand All @@ -23,7 +23,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT="5.6.14-300.fc32.x86_64"
CONFIG_BUILD_SALT="5.6.15-300.fc32.x86_64"
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
Expand Down Expand Up @@ -831,11 +831,8 @@ CONFIG_ARCH_HAS_MEM_ENCRYPT=y
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
# end of GCOV-based kernel profiling

CONFIG_PLUGIN_HOSTCC="g++"
CONFIG_PLUGIN_HOSTCC=""
CONFIG_HAVE_GCC_PLUGINS=y
CONFIG_GCC_PLUGINS=y
# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
# end of General architecture-dependent options

CONFIG_RT_MUTEXES=y
Expand Down Expand Up @@ -8465,10 +8462,6 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
# Memory initialization
#
CONFIG_INIT_STACK_NONE=y
# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
# CONFIG_GCC_PLUGIN_STACKLEAK is not set
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
# end of Memory initialization
Expand Down
2 changes: 1 addition & 1 deletion rel
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2
1
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.6.15
5.6.16

0 comments on commit 6625849

Please sign in to comment.