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: 122671517
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-122671517
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: Thomas Huth <thuth(a)redhat.com>
[redhat] Disable CONFIG_S390_HYPFS in the zfcpdump kernel
JIRA: https://issues.redhat.com/browse/RHEL-56069
Upstream Status: RHEL only
CONFIG_S390_HYPFS has been split from CONFIG_S390_HYPFS_FS (with "_FS" suffix)
in upstream commit 3325b4d857999 ("s390/hypfs: factor out filesystem code").
Since we have CONFIG_S390_HYPFS_FS disabled for the zfcpdump kernel on s390x,
we should use the same setting for the new CONFIG_S390_HYPFS, too.
Signed-off-by: Thomas Huth <thuth(a)redhat.com>
diff --git a/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_S390_HYPFS b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_S390_HYPFS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/s390x/zfcpdump/CONFIG_S390_HYPFS
@@ -0,0 +1 @@
+# CONFIG_S390_HYPFS is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3333
From: Jan Stancek <jstancek(a)redhat.com>
spec: fix "unexpected argument to non-parametric macro" warnings
warning: /builddir/build/SPECS/kernel.spec: line 1733: unexpected argument to non-parametric macro %uname_suffix
warning: /builddir/build/SPECS/kernel.spec: line 1733: unexpected argument to non-parametric macro %uname_variant
...
Signed-off-by: Jan Stancek <jstancek(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -56,7 +56,7 @@
# Replace '-' with '_' where needed so that variants can use '-' in
# their name.
-%define uname_suffix %{lua:
+%define uname_suffix() %{lua:
local flavour = rpm.expand('%{?1:+%{1}}')
flavour = flavour:gsub('-', '_')
if flavour ~= '' then
@@ -69,7 +69,7 @@
# string. However, kernel-64k-debug is the debug version of kernel-64k,
# in this case we need to return "64k", and so on. This is used in
# macros below where we need this for some uname based requires.
-%define uname_variant %{lua:
+%define uname_variant() %{lua:
local flavour = rpm.expand('%{?1:%{1}}')
_, _, main, sub = flavour:find("(%w+)-(.*)")
if main then
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3326
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: 122170507
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-122170507
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: Justin M. Forbes <jforbes(a)fedoraproject.org>
Add weakdep support to the kernel spec
Upstream change 61842868de13aa7fd7391c626e889f4d6f1450bf when combined
with a modern kmod creates a situation where modules.weakdep is
"installed but not packaged". We should handle this file like the rest
of the depmod generated files. Do not package it, but create the ghost
entry for when it gets generated on post.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2793,7 +2793,7 @@ BuildKernel() {
# in case below list needs to be extended, remember to add a
# matching ghost entry in the files section as well
rm -f modules.{alias,alias.bin,builtin.alias.bin,builtin.bin} \
- modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin}
+ modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin,weakdep}
popd
}
@@ -3991,6 +3991,7 @@ fi\
%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.softdep\
%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols\
%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols.bin\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.weakdep\
%{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\
%{expand:%%files %{?3:%{3}-}devel}\
%defverify(not mtime)\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3324
From: Herbert Xu <herbert.xu(a)redhat.com>
not upstream: Disable vdso getrandom when FIPS is enabled
In order to ensure that the FIPS-certified RNG is always used,
disable the vdso getrandom code by always making it fall back
to getrandom(2) when FIPS mode is enabled.
Signed-off-by: Herbert Xu <herbert.xu(a)redhat.com>
diff --git a/drivers/char/random.c b/drivers/char/random.c
index blahblah..blahblah 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -55,6 +55,7 @@
#include <linux/suspend.h>
#include <linux/siphash.h>
#include <linux/sched/isolation.h>
+#include <linux/fips.h>
#include <crypto/chacha.h>
#include <crypto/blake2s.h>
#ifdef CONFIG_VDSO_GETRANDOM
@@ -741,7 +742,8 @@ static void __cold _credit_init_bits(size_t bits)
queue_work(system_unbound_wq, &set_ready);
atomic_notifier_call_chain(&random_ready_notifier, 0, NULL);
#ifdef CONFIG_VDSO_GETRANDOM
- WRITE_ONCE(_vdso_rng_data.is_ready, true);
+ if (!fips_enabled)
+ WRITE_ONCE(_vdso_rng_data.is_ready, true);
#endif
wake_up_interruptible(&crng_init_wait);
kill_fasync(&fasync, SIGIO, POLL_IN);
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3311
From: Tomas Henzl <thenzl(a)redhat.com>
aacraid:i driver disable
Upstream Status: RHEL only
Disable the aacraid driver in RHEL10
Signed-off-by: Tomas Henzl <thenzl(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_SCSI_AACRAID b/redhat/configs/common/generic/CONFIG_SCSI_AACRAID
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_SCSI_AACRAID
+++ b/redhat/configs/common/generic/CONFIG_SCSI_AACRAID
@@ -1 +1 @@
-CONFIG_SCSI_AACRAID=m
+# CONFIG_SCSI_AACRAID is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3322