From: Michal Schmidt <mschmidt(a)redhat.com>
redhat/configs: delete renamed CONFIG_MLX5_EN_MACSEC
CONFIG_MLX5_EN_MACSEC was renamed to CONFIG_MLX5_MACSEC in
commit 7390762a0737 ("net/mlx5e: Move MACsec flow steering operations
to be used as core library"). Remove the old name from redhat/configs.
The feature is already correctly enabled under the new name.
Signed-off-by: Michal Schmidt <mschmidt(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_MLX5_EN_MACSEC b/redhat/configs/common/generic/CONFIG_MLX5_EN_MACSEC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_MLX5_EN_MACSEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MLX5_EN_MACSEC=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3144
From: Waiman Long <longman(a)redhat.com>
redhat/configs: Enable CONFIG_MITIGATION_SLS for RHEL
Like Fedora, CONFIG_MITIGATION_SLS had been enabled for RHEL9 since
9.3. Update the kernel-ark setting to match current RHEL9 setting.
Signed-off-by: Waiman Long <longman(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SLS b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SLS
rename from redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SLS
rename to redhat/configs/common/generic/x86/CONFIG_MITIGATION_SLS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/x86/CONFIG_MITIGATION_SLS
+++ b/redhat/configs/common/generic/x86/CONFIG_MITIGATION_SLS
diff --git a/redhat/configs/rhel/generic/x86/CONFIG_MITIGATION_SLS b/redhat/configs/rhel/generic/x86/CONFIG_MITIGATION_SLS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/x86/CONFIG_MITIGATION_SLS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MITIGATION_SLS is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3222
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in drivers/perf
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: ARM_NI [=n]
Type : tristate
Defined at drivers/perf/Kconfig:51
Prompt: Arm NI-700 PMU support
Depends on: PERF_EVENTS [=y] && (ARM64 [=y] || COMPILE_TEST [=n])
Location:
-> Device Drivers
-> Performance monitor support
-> Arm NI-700 PMU support (ARM_NI [=n])
Commit: 4d5a7680f2b4 (perf: Add driver for Arm NI-700 interconnect PMU)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
v2:
- CONFIG_ARM_NI enabled as a module for aarch64.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_ARM_NI b/redhat/configs/pending-rhel/generic/CONFIG_ARM_NI
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_ARM_NI
+++ /dev/null
@@ -1,14 +0,0 @@
-# Symbol: ARM_NI [=n]
-# Type : tristate
-# Defined at drivers/perf/Kconfig:51
-# Prompt: Arm NI-700 PMU support
-# Depends on: PERF_EVENTS [=y] && (ARM64 [=y] || COMPILE_TEST [=n])
-# Location:
-# -> Device Drivers
-# -> Performance monitor support
-# -> Arm NI-700 PMU support (ARM_NI [=n])
-#
-#
-#
-# Commit: 4d5a7680f2b4 (perf: Add driver for Arm NI-700 interconnect PMU)
-# CONFIG_ARM_NI is not set
diff --git a/redhat/configs/rhel/generic/arm/aarch64/CONFIG_ARM_NI b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_ARM_NI
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_ARM_NI
@@ -0,0 +1 @@
+CONFIG_ARM_NI=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3358
From: Brian Masney <bmasney(a)redhat.com>
redhat/configs: add bootconfig to kernel-tools package
Upstream Status: RHEL Only
Add the bootconfig binary to the kernel-tools package.
CONFIG_BOOT_CONFIG is already enabled in RHEL and this allows having a
separate file with the kernel parameters and is described at
https://docs.kernel.org/admin-guide/bootconfig.html. We intend to use
this for automotive for testing purposes since some embedded platforms
limit the kernel command line paramters to 511 bytes.
Signed-off-by: Brian Masney <bmasney(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
@@ -1234,7 +1234,7 @@ This package provides debug information for package %{package_name}-tools.
# symlinks because of the trailing nonmatching alternation and
# the leading .*, because of find-debuginfo.sh's buggy handling
# of matching the pattern against the symlinks file.
-%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o %{package_name}-tools-debuginfo.list}
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/bootconfig(\.debug)?|.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o %{package_name}-tools-debuginfo.list}
%package -n rtla
%if 0%{gemini}
@@ -3037,6 +3037,10 @@ pushd tools/thermal/tmon/
%{log_msg "build tmon"}
%{tools_make}
popd
+pushd tools/bootconfig/
+%{log_msg "build bootconfig"}
+%{tools_make}
+popd
pushd tools/iio/
%{log_msg "build iio"}
%{tools_make}
@@ -3351,6 +3355,9 @@ chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
pushd tools/thermal/tmon
%{tools_make} INSTALL_ROOT=%{buildroot} install
popd
+pushd tools/bootconfig
+%{tools_make} DESTDIR=%{buildroot} install
+popd
pushd tools/iio
%{tools_make} DESTDIR=%{buildroot} install
popd
@@ -3878,6 +3885,7 @@ fi\
# cpupowerarchs
%endif
%{_bindir}/tmon
+%{_bindir}/bootconfig
%{_bindir}/iio_event_monitor
%{_bindir}/iio_generic_buffer
%{_bindir}/lsiio
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3463
From: Don Zickus <dzickus(a)redhat.com>
Update the RHEL_DIFFERENCES help string
It was pointed out that the kconfig for RHEL_DIFFERENCES did not match
the intention of the kconfig no more. Update the text to reflect the
current usage.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/Kconfig.redhat b/Kconfig.redhat
index blahblah..blahblah 100644
--- a/Kconfig.redhat
+++ b/Kconfig.redhat
@@ -6,13 +6,10 @@
menu "Red Hat options"
config RHEL_DIFFERENCES
- bool "Remove support for deprecated features"
+ bool "Enable RHEL-only code"
help
- Red Hat may choose to deprecate certain features in its kernels.
- Enable this option to remove support for hardware that is no
- longer supported.
-
- Unless you want a restricted kernel, say N here.
+ This option controls whether rhel-only changes are enabled during
+ the build. Unless you want to enable rhel-only changes, say N here.
config RH_KABI_SIZE_ALIGN_CHECKS
bool "Enables more stringent kabi checks in the macros"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3466
From: Don Zickus <dzickus(a)redhat.com>
Update the RHEL_DIFFERENCES help string
It was pointed out that the kconfig for RHEL_DIFFERENCES did not match
the intention of the kconfig no more. Update the text to reflect the
current usage.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/Kconfig.redhat b/Kconfig.redhat
index blahblah..blahblah 100644
--- a/Kconfig.redhat
+++ b/Kconfig.redhat
@@ -6,13 +6,14 @@
menu "Red Hat options"
config RHEL_DIFFERENCES
- bool "Remove support for deprecated features"
+ bool "Enable RHEL-only code"
help
- Red Hat may choose to deprecate certain features in its kernels.
- Enable this option to remove support for hardware that is no
- longer supported.
+ This option makes it simple to disable RHEL-only code to compare
+ with upstream. RHEL-only code is necessary for RHEL features but
+ unnecessary for Fedora. Disabling allows the Fedora community to
+ compile code closer to upstream.
- Unless you want a restricted kernel, say N here.
+ Unless you want to enable RHEL-only features, say N here.
config RH_KABI_SIZE_ALIGN_CHECKS
bool "Enables more stringent kabi checks in the macros"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3466