From: Davide Caratti <dcara...@redhat.com>

rhel_files: ensure all qdiscs are in modules-core

JIRA: https://issues.redhat.com/browse/RHEL-79818

by design, kernel-ark blacklists all modules in modules-extra that have a
module alias. Now that qdiscs have their module alias [1], some of them
became blacklisted even if we didn't really intend to: move them back to
kernel-modules to preserve feature parity with other qdiscs (and previous
releases).

[1] 
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=241a94abcf465ba9363d93168da5ddd47002930f

Signed-off-by: Davide Caratti <dcara...@redhat.com>

diff --git a/redhat/fedora_files/def_variants.yaml.fedora 
b/redhat/fedora_files/def_variants.yaml.fedora
index blahblah..blahblah 100644
--- a/redhat/fedora_files/def_variants.yaml.fedora
+++ b/redhat/fedora_files/def_variants.yaml.fedora
@@ -464,17 +464,6 @@ rules:
   - net/rds/rds.*: modules-extra
   - net/rose/rose.*: modules-extra
   - net/rxrpc/.*: modules-core
-  - net/sched/sch_choke.*: modules-extra
-  - net/sched/sch_drr.*: modules-extra
-  - net/sched/sch_etf.*: modules-extra
-  - net/sched/sch_gred.*: modules-extra
-  - net/sched/sch_mqprio.ko: modules-extra
-  - net/sched/sch_multiq.*: modules-extra
-  - net/sched/sch_netem.*: modules-extra
-  - net/sched/sch_qfq.*: modules-extra
-  - net/sched/sch_red.*: modules-extra
-  - net/sched/sch_sfb.*: modules-extra
-  - net/sched/sch_teql.*: modules-extra
   - net/sched/.*: modules-core
   - net/sunrpc/xprtrdma/rpcrdma.*: modules
   - net/sunrpc/.*: modules-core
diff --git a/redhat/rhel_files/def_variants.yaml.rhel 
b/redhat/rhel_files/def_variants.yaml.rhel
index blahblah..blahblah 100644
--- a/redhat/rhel_files/def_variants.yaml.rhel
+++ b/redhat/rhel_files/def_variants.yaml.rhel
@@ -480,16 +480,6 @@ rules:
   - net/rds/rds.*: modules-extra
   - net/rose/rose.*: modules-extra
   - net/rxrpc/.*: modules-partner
-  - net/sched/sch_choke.*: modules-extra
-  - net/sched/sch_drr.*: modules-extra
-  - net/sched/sch_gred.*: modules-extra
-  - net/sched/sch_mqprio.ko: modules-extra
-  - net/sched/sch_multiq.*: modules-extra
-  - net/sched/sch_netem.*: modules-extra
-  - net/sched/sch_qfq.*: modules-extra
-  - net/sched/sch_red.*: modules-extra
-  - net/sched/sch_sfb.*: modules-extra
-  - net/sched/sch_teql.*: modules-extra
   - net/sched/.*: modules-core
   - net/sctp/.*: modules-extra
   - net/sunrpc/xprtrdma/rpcrdma.*: modules

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3712

-- 
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to