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: pbrobinson on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1284
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.
We want the TRUSTED_KEYS support built in everywhere, it's currently
just built in for x86/power on ark. We need it built in for aarch64
as well, and it should be the same on Fedora.
Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
---
redhat/configs/ark/generic/powerpc/CONFIG_TRUSTED_KEYS | 1 -
redhat/configs/ark/generic/x86/x86_64/CONFIG_TRUSTED_KEYS | 1 -
redhat/configs/ark/generic/CONFIG_TEE => redhat/configs/common/generic/CONFIG_TEE | 0
redhat/configs/common/generic/CONFIG_TRUSTED_KEYS | 2 +-
redhat/configs/fedora/generic/arm/CONFIG_TEE | 1 -
redhat/configs/fedora/generic/CONFIG_TEE | 1 -
6 files changed, 1 insertions(+), 5 deletions(-)
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1363
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.
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: SND_HDA_CODEC_CS8409 [=n]
Type : tristate
Defined at sound/pci/hda/Kconfig:160
Prompt: Build Cirrus Logic HDA bridge support
Depends on: SOUND [=m] && !UML && SND [=m] && SND_HDA [=m]
Location:
-> Device Drivers
-> Sound card support (SOUND [=m])
-> Advanced Linux Sound Architecture (SND [=m])
-> HD-Audio
Selects: SND_HDA_GENERIC [=m]
---
Cc: Jaroslav Kysela <jkysela(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_SND_HDA_CODEC_CS8409 | 1 +
redhat/configs/pending-common/generic/CONFIG_SND_HDA_CODEC_CS8409 | 15 ----------
2 files changed, 1 insertions(+), 15 deletions(-)
From: Herton R. Krzesinski <herton(a)redhat.com>
redhat: add *-matched meta packages to rpminspect emptyrpm config
Bugzilla: INTERNAL
Upstream Status: RHEL-only
The emptyrpm test is asking today for verification of *-matched empty meta
packages. Those are meta packages and are intended to be empty (without
files). Thus add these to the exclusion list for emptyrpm rpminspect
test.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff --git a/redhat/rpminspect.yaml b/redhat/rpminspect.yaml
index blahblah..blahblah 100644
--- a/redhat/rpminspect.yaml
+++ b/redhat/rpminspect.yaml
@@ -5,6 +5,9 @@ emptyrpm:
expected_empty:
- kernel
- kernel-debug
+ - kernel-debug-devel-matched
+ - kernel-devel-matched
- kernel-lpae
- kernel-zfcpdump
+ - kernel-zfcpdump-devel-matched
- kernel-zfcpdump-modules
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1418
From: Mark Salter <msalter(a)redhat.com>
Use common config for NODES_SHIFT
ARK is currently has CONFIG_NODES_SHIFT=6 where Fedora is set
to 9. Let's simplify things and share the Fedora config with
ARK.
Signed-off-by: Mark Salter <msalter(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_NODES_SHIFT b/redhat/configs/ark/generic/arm/aarch64/CONFIG_NODES_SHIFT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_NODES_SHIFT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NODES_SHIFT=6
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NODES_SHIFT b/redhat/configs/common/generic/arm/aarch64/CONFIG_NODES_SHIFT
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_NODES_SHIFT
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_NODES_SHIFT
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NODES_SHIFT
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_NODES_SHIFT
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1333
From: Herton R. Krzesinski <herton(a)redhat.com>
redhat: fix typo and make the output more silent for dist-git sync
The addition of gitlab centos dist-git sync added a typo, plus
the dist-git check about the GL_DISTGIT_USER setting was verbose,
make it silent now.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -403,9 +403,9 @@ dist-git: dist-srpm $(KABI_TARBALL) $(KABIDW_TARBALL)
ifeq ("$(RHDISTGIT_BRANCH)", "")
$(error RHDISTGIT_BRANCH unset)
endif
- if [ "$(DISTRO)" == "centos" ]; then \
+ @if [ "$(DISTRO)" == "centos" ]; then \
if [ -z "$(GL_DISTGIT_USER)" ]; then \
- echo "Error: please Please provide your gitlab username with GL_DISTGIT_USER"; \
+ echo "Error: please provide your gitlab username with GL_DISTGIT_USER"; \
exit 1; \
fi; \
fi
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1417
From: Kamal Heib <kheib(a)redhat.com>
redhat/configs: Disable Soft-RoCE driver
We decided to disable the Soft-RoCE driver due to the current unstable
status of the driver in the upstream kernel, also because the driver is
not fully maintained in the upstream community.
Upstream: RHEL-only.
Signed-off-by: Kamal Heib <kheib(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_RDMA_RXE b/redhat/configs/common/generic/CONFIG_RDMA_RXE
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_RDMA_RXE
+++ b/redhat/configs/common/generic/CONFIG_RDMA_RXE
@@ -1 +1 @@
-CONFIG_RDMA_RXE=m
+# CONFIG_RDMA_RXE is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1299