From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in crypto/Kconfig
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: CRYPTO_KRB5ENC [=n]
Type : tristate
Defined at crypto/Kconfig:237
Prompt: Kerberos 5 combined hash+cipher support
Depends on: CRYPTO [=y]
Location:
-> Cryptographic API (CRYPTO [=y])
-> Crypto core or helper
-> Kerberos 5 combined hash+cipher support (CRYPTO_KRB5ENC [=n])
Selects: CRYPTO_AEAD [=y] && CRYPTO_SKCIPHER [=y] && CRYPTO_MANAGER [=y] && CRYPTO_HASH [=y] && CRYPTO_NULL [=y]
Selected by [n]:
- CRYPTO_KRB5 [=n] && CRYPTO [=y]
Commit: d1775a177f7f (crypto: Add 'krb5enc' hash and cipher AEAD algorithm)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_CRYPTO_KRB5ENC b/redhat/configs/pending-rhel/generic/CONFIG_CRYPTO_KRB5ENC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_CRYPTO_KRB5ENC
+++ /dev/null
@@ -1,17 +0,0 @@
-# Symbol: CRYPTO_KRB5ENC [=n]
-# Type : tristate
-# Defined at crypto/Kconfig:237
-# Prompt: Kerberos 5 combined hash+cipher support
-# Depends on: CRYPTO [=y]
-# Location:
-# -> Cryptographic API (CRYPTO [=y])
-# -> Crypto core or helper
-# -> Kerberos 5 combined hash+cipher support (CRYPTO_KRB5ENC [=n])
-# Selects: CRYPTO_AEAD [=y] && CRYPTO_SKCIPHER [=y] && CRYPTO_MANAGER [=y] && CRYPTO_HASH [=y] && CRYPTO_NULL [=y]
-# Selected by [n]:
-# - CRYPTO_KRB5 [=n] && CRYPTO [=y]
-#
-#
-#
-# Commit: d1775a177f7f (crypto: Add 'krb5enc' hash and cipher AEAD algorithm)
-# CONFIG_CRYPTO_KRB5ENC is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_CRYPTO_KRB5ENC b/redhat/configs/rhel/generic/CONFIG_CRYPTO_KRB5ENC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_CRYPTO_KRB5ENC
@@ -0,0 +1 @@
+# CONFIG_CRYPTO_KRB5ENC is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3788
From: Scott Weaver <scweaver(a)redhat.com>
[redhat] automotive: enable CONFIG_PROBE_EVENTS_BTF_ARGS
533c20b062d7c ('ftrace: Add print_function_args()') adds a new function
that requires trace_btf.c to be built.
For now let's enable CONFIG_PROBE_EVENTS_BTF_ARGS so that the automotive
build does not fail.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
diff --git a/redhat/configs/rhel/automotive/generic/CONFIG_PROBE_EVENTS_BTF_ARGS b/redhat/configs/rhel/automotive/generic/CONFIG_PROBE_EVENTS_BTF_ARGS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/automotive/generic/CONFIG_PROBE_EVENTS_BTF_ARGS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PROBE_EVENTS_BTF_ARGS is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3783
From: Jan Stancek <jstancek(a)redhat.com>
redhat: bump RHEL_MAJOR
Similar to 93f658c7b8a8 ("redhat: bump RHEL_MAJOR and add the changelog file for it"),
bump RHEL_MAJOR. kernel-ark does not track anymore work for RHEL 10/CentOS Stream 10.
We look forward to the next major. While "9.99" was chosen as the version for
the work preceding RHEL 10, bump the major so the considered version now is
"10.99".
Changelog will be created automatically on next release. Old entries are not moved,
to avoid conflicts in the next os-build rebase. All changelog entries will be picked
up with the first release commit in the next os-build rebase.
Signed-off-by: Jan Stancek <jstancek(a)redhat.com>
diff --git a/Makefile.rhelver b/Makefile.rhelver
index blahblah..blahblah 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -1,4 +1,4 @@
-RHEL_MAJOR = 9
+RHEL_MAJOR = 10
RHEL_MINOR = 99
#
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3785
From: Viktor Malik <vmalik(a)redhat.com>
redhat/configs: Add CONFIG_PPC_FTRACE_OUT_OF_LINE_NUM_RESERVE
Add new config option CONFIG_PPC_FTRACE_OUT_OF_LINE_NUM_RESERVE added by
upstream commit cf9bc0efcce2 ("powerpc64/ftrace: Support .text larger
than 32MB with out-of-line stubs").
Set the value to the default 32768 as it is suitable for vmlinux with
.text section up to 48MB. Currently, RHEL vmlinux on ppc64le has 18MB.
Signed-off-by: Viktor Malik <vmalik(a)redhat.com>
diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_PPC_FTRACE_OUT_OF_LINE_NUM_RESERVE b/redhat/configs/rhel/generic/powerpc/CONFIG_PPC_FTRACE_OUT_OF_LINE_NUM_RESERVE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/powerpc/CONFIG_PPC_FTRACE_OUT_OF_LINE_NUM_RESERVE
@@ -0,0 +1 @@
+CONFIG_PPC_FTRACE_OUT_OF_LINE_NUM_RESERVE=32768
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3784
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 130861724
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-130861724
Tests that were not ran because of internal issues:
Boot test [s390x]
CKI/restraint [s390x]
machineinfo [s390x]
Reboot test [s390x]
SELinux Custom Module Setup [ppc64le, s390x]
stress: stress-ng - cpu [s390x]
stress: stress-ng - cpu-cache [s390x]
stress: stress-ng - interrupt [s390x]
stress: stress-ng - memory [s390x]
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3783
This is a test.
533c20b062d7c ('ftrace: Add print_function_args()') adds a new function
that requires trace_btf.c to be built.
For now let's enable CONFIG_PROBE_EVENTS_BTF_ARGS so that the automotive
build does not fail.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
redhat/configs/rhel/automotive/generic/CONFIG_PROBE_EVENTS_BTF_ARGS | 1 -
redhat/kernel.spec.template | 1 +
2 files changed, 1 insertions(+), 1 deletions(-)