Skip to content

Commit 1eec75c

Browse files
committed
[CIQ] Refresh Configs after making modifications
jira LE-2628 The config changes should have been run through make olddefconfig but were not after making their modifications. We want to do thsi so that we can identify easily configs that might be introduced in a Zeta release of the LT or Stable GKH kernels. Fixes: 59a132d
1 parent 15b2f6b commit 1eec75c

5 files changed

+14
-25
lines changed

ciq/configs/kernel-aarch64-64k-debug.config

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# arm64
21
#
32
# Automatically generated file; DO NOT EDIT.
43
# Linux/arm64 6.12.15 Kernel Configuration
@@ -7830,10 +7829,10 @@ CONFIG_SECURITY_YAMA=y
78307829
# CONFIG_SECURITY_SAFESETID is not set
78317830
CONFIG_SECURITY_LOCKDOWN_LSM=y
78327831
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
7833-
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
78347832
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
78357833
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
78367834
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
7835+
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
78377836
CONFIG_SECURITY_LANDLOCK=y
78387837
# CONFIG_SECURITY_IPE is not set
78397838
CONFIG_INTEGRITY=y

ciq/configs/kernel-aarch64-64k.config

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# arm64
21
#
32
# Automatically generated file; DO NOT EDIT.
43
# Linux/arm64 6.12.15 Kernel Configuration
@@ -7808,10 +7807,10 @@ CONFIG_SECURITY_YAMA=y
78087807
# CONFIG_SECURITY_SAFESETID is not set
78097808
CONFIG_SECURITY_LOCKDOWN_LSM=y
78107809
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
7811-
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
78127810
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
78137811
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
78147812
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
7813+
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
78157814
CONFIG_SECURITY_LANDLOCK=y
78167815
# CONFIG_SECURITY_IPE is not set
78177816
CONFIG_INTEGRITY=y

ciq/configs/kernel-aarch64.config

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# arm64
21
#
32
# Automatically generated file; DO NOT EDIT.
43
# Linux/arm64 6.12.15 Kernel Configuration
@@ -7814,10 +7813,10 @@ CONFIG_SECURITY_YAMA=y
78147813
# CONFIG_SECURITY_SAFESETID is not set
78157814
CONFIG_SECURITY_LOCKDOWN_LSM=y
78167815
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
7817-
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
78187816
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
78197817
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
78207818
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
7819+
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
78217820
CONFIG_SECURITY_LANDLOCK=y
78227821
# CONFIG_SECURITY_IPE is not set
78237822
CONFIG_INTEGRITY=y

ciq/configs/kernel-x86_64-debug.config

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# x86_64
21
#
32
# Automatically generated file; DO NOT EDIT.
43
# Linux/x86_64 6.12.15 Kernel Configuration
@@ -463,8 +462,6 @@ CONFIG_PERF_EVENTS_AMD_UNCORE=y
463462
CONFIG_PERF_EVENTS_AMD_BRS=y
464463
# end of Performance monitoring
465464

466-
CONFIG_X86_16BIT=y
467-
CONFIG_X86_ESPFIX64=y
468465
CONFIG_X86_VSYSCALL_EMULATION=y
469466
CONFIG_X86_IOPL_IOPERM=y
470467
CONFIG_MICROCODE=y
@@ -510,10 +507,10 @@ CONFIG_EFI_STUB=y
510507
CONFIG_EFI_HANDOVER_PROTOCOL=y
511508
CONFIG_EFI_MIXED=y
512509
CONFIG_EFI_RUNTIME_MAP=y
513-
CONFIG_HZ_100=y
510+
CONFIG_HZ_100=y
514511
# CONFIG_HZ_250 is not set
515512
# CONFIG_HZ_300 is not set
516-
# CONFIG_HZ=1000 is not set
513+
# CONFIG_HZ_1000 is not set
517514
CONFIG_HZ=100
518515
CONFIG_SCHED_HRTICK=y
519516
CONFIG_ARCH_SUPPORTS_KEXEC=y
@@ -539,12 +536,12 @@ CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
539536
CONFIG_HOTPLUG_CPU=y
540537
# CONFIG_COMPAT_VDSO is not set
541538
CONFIG_LEGACY_VSYSCALL_XONLY=y
542-
CONFIG_LEGACY_VSYSCALL_NONE=n
539+
# CONFIG_LEGACY_VSYSCALL_NONE is not set
543540
# CONFIG_CMDLINE_BOOL is not set
544-
CONFIG_MODIFY_LDT_SYSCALL=n
541+
# CONFIG_MODIFY_LDT_SYSCALL is not set
545542
# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
546543
CONFIG_HAVE_LIVEPATCH=y
547-
CONFIG_LIVEPATCH=n
544+
# CONFIG_LIVEPATCH is not set
548545
# end of Processor type and features
549546

550547
CONFIG_CC_HAS_NAMED_AS=y
@@ -8609,10 +8606,10 @@ CONFIG_SECURITY_YAMA=y
86098606
# CONFIG_SECURITY_SAFESETID is not set
86108607
CONFIG_SECURITY_LOCKDOWN_LSM=y
86118608
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
8612-
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
86138609
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
86148610
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
86158611
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
8612+
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
86168613
CONFIG_SECURITY_LANDLOCK=y
86178614
# CONFIG_SECURITY_IPE is not set
86188615
CONFIG_INTEGRITY=y
@@ -9532,7 +9529,6 @@ CONFIG_SAMPLES=y
95329529
# CONFIG_SAMPLE_FPROBE is not set
95339530
# CONFIG_SAMPLE_KFIFO is not set
95349531
# CONFIG_SAMPLE_KDB is not set
9535-
# CONFIG_SAMPLE_LIVEPATCH is not set
95369532
# CONFIG_SAMPLE_CONFIGFS is not set
95379533
# CONFIG_SAMPLE_CONNECTOR is not set
95389534
# CONFIG_SAMPLE_FANOTIFY_ERROR is not set

ciq/configs/kernel-x86_64.config

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# x86_64
21
#
32
# Automatically generated file; DO NOT EDIT.
43
# Linux/x86_64 6.12.15 Kernel Configuration
@@ -460,8 +459,6 @@ CONFIG_PERF_EVENTS_AMD_UNCORE=y
460459
CONFIG_PERF_EVENTS_AMD_BRS=y
461460
# end of Performance monitoring
462461

463-
CONFIG_X86_16BIT=y
464-
CONFIG_X86_ESPFIX64=y
465462
CONFIG_X86_VSYSCALL_EMULATION=y
466463
CONFIG_X86_IOPL_IOPERM=y
467464
CONFIG_MICROCODE=y
@@ -509,7 +506,7 @@ CONFIG_EFI_MIXED=y
509506
CONFIG_EFI_RUNTIME_MAP=y
510507
CONFIG_HZ_100=y
511508
# CONFIG_HZ_250 is not set
512-
# CONFIG_HZ_300 is not seti
509+
# CONFIG_HZ_300 is not set
513510
# CONFIG_HZ_1000 is not set
514511
CONFIG_HZ=100
515512
CONFIG_SCHED_HRTICK=y
@@ -536,12 +533,12 @@ CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
536533
CONFIG_HOTPLUG_CPU=y
537534
# CONFIG_COMPAT_VDSO is not set
538535
CONFIG_LEGACY_VSYSCALL_XONLY=y
539-
CONFIG_LEGACY_VSYSCALL_NONE=n
536+
# CONFIG_LEGACY_VSYSCALL_NONE is not set
540537
# CONFIG_CMDLINE_BOOL is not set
541-
CONFIG_MODIFY_LDT_SYSCALL=n
538+
# CONFIG_MODIFY_LDT_SYSCALL is not set
542539
# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
543540
CONFIG_HAVE_LIVEPATCH=y
544-
CONFIG_LIVEPATCH=n
541+
# CONFIG_LIVEPATCH is not set
545542
# end of Processor type and features
546543

547544
CONFIG_CC_HAS_NAMED_AS=y
@@ -8582,10 +8579,10 @@ CONFIG_SECURITY_YAMA=y
85828579
# CONFIG_SECURITY_SAFESETID is not set
85838580
CONFIG_SECURITY_LOCKDOWN_LSM=y
85848581
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
8585-
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
85868582
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
85878583
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
85888584
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
8585+
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
85898586
CONFIG_SECURITY_LANDLOCK=y
85908587
# CONFIG_SECURITY_IPE is not set
85918588
CONFIG_INTEGRITY=y
@@ -9468,7 +9465,6 @@ CONFIG_SAMPLES=y
94689465
# CONFIG_SAMPLE_FPROBE is not set
94699466
# CONFIG_SAMPLE_KFIFO is not set
94709467
# CONFIG_SAMPLE_KDB is not set
9471-
# CONFIG_SAMPLE_LIVEPATCH is not set
94729468
# CONFIG_SAMPLE_CONFIGFS is not set
94739469
# CONFIG_SAMPLE_CONNECTOR is not set
94749470
# CONFIG_SAMPLE_FANOTIFY_ERROR is not set

0 commit comments

Comments
 (0)