From: Ken Cox <jkc(a)redhat.com>
Enable e1000 in rhel9 as unsupported
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2002344
Upstream Status: RHEL only
Enable e1000 but also add a taint to there is no mistake that
this is not supported.
Signed-off-by: Ken Cox <jkc(a)redhat.com>
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index blahblah..blahblah 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -224,6 +224,9 @@ static int __init e1000_init_module(void)
pr_info("%s\n", e1000_copyright);
+ add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
+ pr_warn("E1000 MODULE IS NOT SUPPORTED\n");
+
ret = pci_register_driver(&e1000_driver);
if (copybreak != COPYBREAK_DEFAULT) {
if (copybreak == 0)
diff --git a/redhat/configs/ark/generic/CONFIG_E1000 b/redhat/configs/ark/generic/CONFIG_E1000
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_E1000
+++ b/redhat/configs/ark/generic/CONFIG_E1000
@@ -1 +1 @@
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1382
From: John Linville <linville(a)redhat.com>
redhat: configs: add CONFIG_ACCESSIBILITY and related items
Signed-off-by: John W. Linville <linville(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_A11Y_BRAILLE_CONSOLE b/redhat/configs/ark/generic/CONFIG_A11Y_BRAILLE_CONSOLE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_A11Y_BRAILLE_CONSOLE
@@ -0,0 +1 @@
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
diff --git a/redhat/configs/ark/generic/CONFIG_ACCESSIBILITY b/redhat/configs/ark/generic/CONFIG_ACCESSIBILITY
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_ACCESSIBILITY
+++ b/redhat/configs/ark/generic/CONFIG_ACCESSIBILITY
@@ -1 +1 @@
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
diff --git a/redhat/configs/ark/generic/s390x/CONFIG_ACCESSIBILITY b/redhat/configs/ark/generic/s390x/CONFIG_ACCESSIBILITY
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/s390x/CONFIG_ACCESSIBILITY
@@ -0,0 +1 @@
+# CONFIG_ACCESSIBILITY is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1448
From: Coiby Xu <coxu(a)redhat.com>
redhat/configs: enable KEXEC_SIG for aarch64 RHEL
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1994858
KEXEC_SIG needs to enabled for aarch64 so the kernel image's signature
can be verified when loading a kernel image via kexec with secureboot
enabled. Note this option has already been enabled for aarch64 Fedora.
CONFIG_KEXEC_IMAGE_VERIFY_SIG is enabled as well so kernel image
signature verification support could be enabled for aarch64.
Signed-off-by: Coiby Xu <coxu(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG b/redhat/configs/common/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
rename from redhat/configs/fedora/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
rename to redhat/configs/common/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
+++ b/redhat/configs/common/generic/CONFIG_KEXEC_IMAGE_VERIFY_SIG
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_KEXEC_SIG b/redhat/configs/common/generic/arm/aarch64/CONFIG_KEXEC_SIG
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_KEXEC_SIG
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_KEXEC_SIG
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_KEXEC_SIG
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_KEXEC_SIG
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1442
From: Jan Stancek on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1433
Use existing config infrastructure to build and validate
gcov-enabled configs. Meaning for each arch we also apply
GCOV options on top and validate it.
From same options dir (kgcov) build also partial config, which
contains only GCOV options. We can merge this partial config
during build on top of existing config, which avoids the need
to store all possible combinations in dist-git and SRPM.
Signed-off-by: Jan Stancek <jstancek(a)redhat.com>
---
redhat/configs/common/kgcov/CONFIG_GCOV_KERNEL | 1 +
redhat/configs/common/kgcov/CONFIG_GCOV_PROFILE_ALL | 1 +
redhat/configs/common/kgcov/CONFIG_GCOV_PROFILE_FTRACE | 1 +
redhat/configs/.gitignore | 1 +
redhat/configs/priority.fedora | 7 +++++++
redhat/configs/priority.rhel | 5 +++++
redhat/configs/priority.snip | 12 ++++++++++++
redhat/Makefile | 2 ++
redhat/kernel.spec.template | 17 ++++++++---------
9 files changed, 38 insertions(+), 9 deletions(-)
From: Don Zickus <dzickus(a)redhat.com>
Ignore the rhel9 kabi files
Use a more generic filter to ignore the kabi files.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/.gitignore b/redhat/.gitignore
index blahblah..blahblah 100644
--- a/redhat/.gitignore
+++ b/redhat/.gitignore
@@ -4,5 +4,5 @@ configs/*-merged
kabi/Module.kabi_*
kabi/kabi-current
-kabi/kabi-rhel8*
-kabi/kabi-rhel8*/*
+kabi/kabi-rhel*
+kabi/kabi-rhel*/*
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1445