From: Jan Stancek <jstancek(a)redhat.com>
redhat/kernel.spec: don't clear entire libdir when building cpupower
cpupower build commands currently clear out entire libdir, wiping
out any other libraries that might be built before. It causes an
issue for upcoming ynl subpackage, which also puts a library
into libdir.
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
@@ -3322,7 +3322,7 @@ rm -rf %{buildroot}%{_libdir}/libperf.a
%if %{with_tools}
%ifarch %{cpupowerarchs}
%{make} -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
-rm -f %{buildroot}%{_libdir}/*.{a,la}
+rm -f %{buildroot}%{_libdir}/cpupower*.{a,la}
%find_lang cpupower
mv cpupower.lang ../
%ifarch x86_64
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3465
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in fs/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: NFS_LOCALIO [=n]
Type : bool
Defined at fs/Kconfig:396
Prompt: NFS client and server support for LOCALIO auxiliary protocol
Depends on: NETWORK_FILESYSTEMS [=y] && NFSD [=m] && NFS_FS [=m]
Location:
-> File systems
-> Network File Systems (NETWORK_FILESYSTEMS [=y])
-> NFS client and server support for LOCALIO auxiliary protocol (NFS_LOCALIO [=n])
Selects: NFS_COMMON_LOCALIO_SUPPORT [=n]
Commit: 2a33a85be451 (nfs_common: add NFS LOCALIO auxiliary protocol enablement)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
v2:
- CONFIG_NFS_LOCALIO enable as a built-in for rhel.
- CONFIG_NFS_COMMON_LOCALIO_SUPPORT enable as a module for rhel.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_NFS_LOCALIO b/redhat/configs/pending-rhel/generic/CONFIG_NFS_LOCALIO
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_NFS_LOCALIO
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: NFS_LOCALIO [=n]
-# Type : bool
-# Defined at fs/Kconfig:396
-# Prompt: NFS client and server support for LOCALIO auxiliary protocol
-# Depends on: NETWORK_FILESYSTEMS [=y] && NFSD [=m] && NFS_FS [=m]
-# Location:
-# -> File systems
-# -> Network File Systems (NETWORK_FILESYSTEMS [=y])
-# -> NFS client and server support for LOCALIO auxiliary protocol (NFS_LOCALIO [=n])
-# Selects: NFS_COMMON_LOCALIO_SUPPORT [=n]
-#
-#
-#
-# Commit: 2a33a85be451 (nfs_common: add NFS LOCALIO auxiliary protocol enablement)
-# CONFIG_NFS_LOCALIO is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_NFS_COMMON_LOCALIO_SUPPORT b/redhat/configs/rhel/generic/CONFIG_NFS_COMMON_LOCALIO_SUPPORT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_NFS_COMMON_LOCALIO_SUPPORT
@@ -0,0 +1 @@
+CONFIG_NFS_COMMON_LOCALIO_SUPPORT=m
diff --git a/redhat/configs/rhel/generic/CONFIG_NFS_LOCALIO b/redhat/configs/rhel/generic/CONFIG_NFS_LOCALIO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_NFS_LOCALIO
@@ -0,0 +1 @@
+CONFIG_NFS_LOCALIO=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3411
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: 125095619
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-125095619
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
`-'
______________________________________________________________________________