Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/813'
Browse files Browse the repository at this point in the history
* origin/pr/813:
  Update to kernel-6.4.13
  • Loading branch information
marmarek committed Sep 10, 2023
2 parents b2bba9e + d85dedd commit af5550c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
13 changes: 8 additions & 5 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-6.4.8-200.fc38.x86_64.rpm)
# Base config based on Fedora's config (kernel-core-6.4.13-200.fc38.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.
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230614 (Red Hat 13.1.1-4)"
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230728 (Red Hat 13.2.1-1)"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=130101
CONFIG_GCC_VERSION=130201
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23900
Expand All @@ -30,7 +30,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT="6.4.8-200.fc38.x86_64"
CONFIG_BUILD_SALT="6.4.13-200.fc38.x86_64"
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
Expand Down Expand Up @@ -534,7 +534,9 @@ CONFIG_CALL_DEPTH_TRACKING=y
# CONFIG_CALL_THUNKS_DEBUG is not set
CONFIG_CPU_IBPB_ENTRY=y
CONFIG_CPU_IBRS_ENTRY=y
CONFIG_CPU_SRSO=y
CONFIG_SLS=y
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_ARCH_HAS_ADD_PAGES=y
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

Expand Down Expand Up @@ -785,6 +787,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
CONFIG_ARCH_HAS_SET_MEMORY=y
CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
CONFIG_ARCH_WANTS_NO_INSTR=y
Expand Down Expand Up @@ -7997,7 +8000,7 @@ CONFIG_UDMABUF=y
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
CONFIG_DMABUF_HEAPS=y
CONFIG_DMABUF_SYSFS_STATS=y
# CONFIG_DMABUF_SYSFS_STATS is not set
CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.8
6.4.13

0 comments on commit af5550c

Please sign in to comment.