From: Rupinderjit Singh on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3373
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
Also, remove scmi configs from rhel as they have already been enabled in
common now.
Signed-off-by: Rupinderjit Singh <rusingh(a)redhat.com>
---
redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_PCA953X_IRQ | 2 +-
redhat/configs/common/generic/arm/aarch64/CONFIG_LEDS_TLC591XX | 2 +-
redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_PCA953X_IRQ | 1 -
redhat/configs/fedora/generic/arm/aarch64/CONFIG_LEDS_TLC591XX | 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_I2C_SCMI | 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_RESET_SCMI | 1 -
6 files changed, 2 insertions(+), 6 deletions(-)
From: pbrobinson on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3423
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
A couple of minor cleanups for common config.
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
---
redhat/configs/common/generic/CONFIG_KS7010 | 1 -
redhat/configs/common/generic/CONFIG_RPMB | 1 +
redhat/configs/pending-fedora/generic/CONFIG_RPMB | 14 --------------
redhat/configs/rhel/generic/CONFIG_RPMB | 1 -
4 files changed, 1 insertions(+), 16 deletions(-)
From: Clark Williams <williams(a)redhat.com>
redhat: enable changes to build rt variants
Set the %with_realtime specfile variable to be 1 and build the
kernel-rt variant with ARK build jobs.
Add the CONFIG_PREEMPT_RT config and set default values for
PREEMPT_AUTO and PREEMPT_RT for the stock kernels and variants.
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_PREEMPT_AUTO b/redhat/configs/common/generic/CONFIG_PREEMPT_AUTO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PREEMPT_AUTO
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_AUTO is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_PREEMPT_RT b/redhat/configs/fedora/generic/CONFIG_PREEMPT_RT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/fedora/generic/CONFIG_PREEMPT_RT
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_RT is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_PREEMPT_RT b/redhat/configs/rhel/generic/CONFIG_PREEMPT_RT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_PREEMPT_RT
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_RT is not set
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_AUTO b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_AUTO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_AUTO
@@ -0,0 +1 @@
+# CONFIG_PREEMPT_AUTO is not set
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
+++ b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
@@ -1 +1 @@
-# CONFIG_PREEMPT_RT is not set
+CONFIG_PREEMPT_RT=y
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
@@ -207,7 +207,7 @@ Summary: The Linux kernel
# kernel-64k (aarch64 kernel with 64K page_size)
%define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
# kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel)
-%define with_realtime %{?_with_realtime: 1} %{?!_with_realtime: 0}
+%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1}
# Supported variants
# with_base with_debug with_gcov
@@ -1871,7 +1871,7 @@ chmod +x scripts/checkpatch.pl
mv COPYING COPYING-%{specrpmversion}-%{release}
# on linux-next prevent scripts/setlocalversion from mucking with our version numbers
-rm -f localversion-next
+rm -f localversion-next localversion-rt
# Mangle /usr/bin/python shebangs to /usr/bin/python3
# Mangle all Python shebangs to be Python 3 explicitly
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3416
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: 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: Guenter Roeck <linux(a)roeck-us.net>
bcachefs: rename version -> bversion for big endian builds
Builds on big endian systems fail as follows.
fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key':
fs/bcachefs/bkey.h:557:41: error:
'const struct bkey' has no member named 'bversion'
The original commit only renamed the variable for little endian builds.
Rename it for big endian builds as well to fix the problem.
Fixes: cf49f8a8c277 ("bcachefs: rename version -> bversion")
Cc: Kent Overstreet <kent.overstreet(a)linux.dev>
Signed-off-by: Guenter Roeck <linux(a)roeck-us.net>
Signed-off-by: Kent Overstreet <kent.overstreet(a)linux.dev>
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index blahblah..blahblah 100644
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -223,7 +223,7 @@ struct bkey {
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
struct bpos p;
__u32 size; /* extent size, in sectors */
- struct bversion version;
+ struct bversion bversion;
__u8 pad[1];
#endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3424