Skip to content

[ciq-6.18.y] Multiple patches tested (2 commits) #1736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmastbergen merged 2 commits into from
Oct 27, 2026
Merged

[ciq-6.18.y] Multiple patches tested (2 commits) #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b894e0a
configs: x86: Disable X86_KERNEL_IBT
bmastbergen Oct 26, 2026
9e33779
[CIQ] ciq_kernel-6.18.58-2 - updated spec
bmastbergen Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ciq/SPECS/kernel-clk6.18.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Summary: The Linux kernel
%define kernel_patch 58
%define buildid .1
%define specversion %{kernel_major_minor}.%{kernel_patch}
%define pkgrelease 1%{?buildid}
%define pkgrelease 2%{?buildid}
%define kversion %{lua:print((rpm.expand("%{kernel_major_minor}"):match("^(%d+)")))}

%define tarfile_release %{specversion}-%{pkgrelease}.el%{rhel}
Expand Down Expand Up @@ -4572,6 +4572,9 @@ fi\
#
#
%changelog
* Mon Oct 26 2026 Brett Mastbergen <bmastbergen@ciq.com> - 6.18.58-2.1
-- configs: x86: Disable X86_KERNEL_IBT (Brett Mastbergen)

* Thu Oct 22 2026 github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - 6.18.58-1.1
-- Rebased changes for Linux 6.18.58 (https://github.com/ctrliq/kernel-src-tree/releases/tag/ciq_kernel-6.18.58-1)
-- [CIQ] v6.18.57 - updated spec (github-actions[bot])
Expand Down
5 changes: 3 additions & 2 deletions ciq/configs/kernel-x86_64-debug.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.18.55 Kernel Configuration
# Linux/x86_64 6.18.58 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -499,7 +499,7 @@ CONFIG_X86_PAT=y
CONFIG_X86_UMIP=y
CONFIG_CC_HAS_IBT=y
CONFIG_X86_CET=y
CONFIG_X86_KERNEL_IBT=y
# CONFIG_X86_KERNEL_IBT is not set
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_ARCH_PKEY_BITS=4
CONFIG_X86_INTEL_TSX_MODE_OFF=y
Expand Down Expand Up @@ -841,6 +841,7 @@ CONFIG_X86_DISABLED_FEATURE_CYRIX_ARR=y
CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
CONFIG_X86_DISABLED_FEATURE_LAM=y
CONFIG_X86_DISABLED_FEATURE_XENPV=y
CONFIG_X86_DISABLED_FEATURE_IBT=y
CONFIG_AS_WRUSS=y
CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
CONFIG_ARCH_HAS_DMA_OPS=y
Expand Down
5 changes: 3 additions & 2 deletions ciq/configs/kernel-x86_64-minimal.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.18.55 Kernel Configuration
# Linux/x86_64 6.18.58 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -494,7 +494,7 @@ CONFIG_X86_PAT=y
CONFIG_X86_UMIP=y
CONFIG_CC_HAS_IBT=y
CONFIG_X86_CET=y
CONFIG_X86_KERNEL_IBT=y
# CONFIG_X86_KERNEL_IBT is not set
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_ARCH_PKEY_BITS=4
CONFIG_X86_INTEL_TSX_MODE_OFF=y
Expand Down Expand Up @@ -817,6 +817,7 @@ CONFIG_X86_DISABLED_FEATURE_CYRIX_ARR=y
CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
CONFIG_X86_DISABLED_FEATURE_LAM=y
CONFIG_X86_DISABLED_FEATURE_XENPV=y
CONFIG_X86_DISABLED_FEATURE_IBT=y
CONFIG_AS_WRUSS=y
CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
CONFIG_ARCH_HAS_DMA_OPS=y
Expand Down
5 changes: 3 additions & 2 deletions ciq/configs/kernel-x86_64.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.18.55 Kernel Configuration
# Linux/x86_64 6.18.58 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -496,7 +496,7 @@ CONFIG_X86_PAT=y
CONFIG_X86_UMIP=y
CONFIG_CC_HAS_IBT=y
CONFIG_X86_CET=y
CONFIG_X86_KERNEL_IBT=y
# CONFIG_X86_KERNEL_IBT is not set
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_ARCH_PKEY_BITS=4
CONFIG_X86_INTEL_TSX_MODE_OFF=y
Expand Down Expand Up @@ -837,6 +837,7 @@ CONFIG_X86_DISABLED_FEATURE_CYRIX_ARR=y
CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
CONFIG_X86_DISABLED_FEATURE_LAM=y
CONFIG_X86_DISABLED_FEATURE_XENPV=y
CONFIG_X86_DISABLED_FEATURE_IBT=y
CONFIG_AS_WRUSS=y
CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
CONFIG_ARCH_HAS_DMA_OPS=y
Expand Down
Loading