kernel-5.17.12-0

* Mon May 30 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.12-0] - Revert "crypto: rng - Override drivers/char/random in FIPS mode" (Justin M. Forbes) - Revert "random: Add hook to override device reads and getrandom(2)" (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
kernel-5.17.11-0
2022-05-30 11:44:19 -05:00 · 2022-05-25 09:33:05 -05:00 · 2022-05-25 08:40:39 -05:00 · 2022-05-18 09:47:07 -05:00 · 2022-05-15 19:36:10 -05:00 · 2022-05-12 09:14:26 -05:00
102 changed files with 22450 additions and 247487 deletions
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@ -1,4 +1,4 @@
-RHEL_MAJOR = 10
+RHEL_MAJOR = 9
 RHEL_MINOR = 99

 #
@ -12,49 +12,34 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 38
+RHEL_RELEASE = 0

 #
-# RHEL_REBASE_NUM
-# ----------------
+# Early y+1 numbering
+# --------------------
+#
+# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y
+# First is RHEL_RELEASE inherited/merged from y as-is, second number
+# is incremented with each build starting from 1. After merge from y,
+# it resets back to 1. This way y+1 nvr reflects status of last merge.
+#
+# Example:
+#
+# rhel8.0                        rhel-8.1
+#   kernel-4.18.0-58.el8   -->     kernel-4.18.0-58.1.el8
+#                                  kernel-4.18.0-58.2.el8
+#   kernel-4.18.0-59.el8           kernel-4.18.0-59.1.el8
+#   kernel-4.18.0-60.el8
+#   kernel-4.18.0-61.el8   -->     kernel-4.18.0-61.1.el8
 #
-# Used in RPM version string for Gemini kernels, which dont use upstream
-# VERSION/PATCHLEVEL/SUBLEVEL. The number represents rebase number for
-# current MAJOR release.
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_REBASE_NUM = 1
-
-
-#
-# ZSTREAM
-# -------
-#
-#  This variable controls whether we use zstream numbering or not for the
-#  package release. The zstream release keeps the build number of the last
-#  build done for ystream for the Beta milestone, and increments a second
-#  number for each build. The third number is used for branched builds
-#  (eg.: for builds with security fixes or hot fixes done outside of the
-#  batch release process).
-#
-#  For example, with ZSTREAM unset or set to "no", all builds will contain
-#  a release with only the build number, eg.: kernel-<kernel version>-X.el*,
-#  where X is the build number. With ZSTREAM set to "yes", we will have
-#  builds with kernel-<kernel version>-X.Y.Z.el*, where X is the last
-#  RHEL_RELEASE number before ZSTREAM flag was set to yes, Y will now be the
-#  build number and Z will always be 1 except if you're doing a branched build
-#  (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
-#  number will be incremented instead of the Y).
-#
-ZSTREAM ?= no
-
-#
-# Automotive
-# ----------
-#
-# Represents the major and minor release used by automotive.
-# Primarily this is used to to identify the build target when
-# building the automotive kernel package.
-AUTOMOTIVE_MAJOR = 2
-AUTOMOTIVE_MINOR = 99
+EARLY_YSTREAM ?= no
+EARLY_YBUILD:=
+EARLY_YRELEASE:=
+ifneq ("$(ZSTREAM)", "yes")
+  ifeq ("$(EARLY_YSTREAM)","yes")
+    RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
+  endif
+endif
--- a/Module.kabi_riscv64
+++ b/Module.kabi_riscv64
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,474 +1,165 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/831ff9bcd8e9eab864062470a3250beb1e1ec924
- 831ff9bcd8e9eab864062470a3250beb1e1ec924 rust: Add -fdiagnostics-show-context to bindgen_skip_c_flags
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/77da23276919a734b100b4856457d1b4c856e758
+ 77da23276919a734b100b4856457d1b4c856e758 Revert "crypto: rng - Override drivers/char/random in FIPS mode"

-https://gitlab.com/cki-project/kernel-ark/-/commit/fe3e9e24af806d756edbda922103b1fa95d9b89b
- fe3e9e24af806d756edbda922103b1fa95d9b89b Revert "Removing Obsolete hba pci-ids from rhel8"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/41f81f1faeab51ba2fe611184467ca22379d50e5
+ 41f81f1faeab51ba2fe611184467ca22379d50e5 Revert "random: Add hook to override device reads and getrandom(2)"

-https://gitlab.com/cki-project/kernel-ark/-/commit/c4a0a995da9df8732f688d09db5252173277589d
- c4a0a995da9df8732f688d09db5252173277589d rh_messages.h: add missing lpfc devices
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/205bec68a0ea67b6bff6fea9603b7b8aeacc9d46
+ 205bec68a0ea67b6bff6fea9603b7b8aeacc9d46 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set

-https://gitlab.com/cki-project/kernel-ark/-/commit/0ad9a88c3263fa8fa39437f69472588917255c99
- 0ad9a88c3263fa8fa39437f69472588917255c99 kernel: extend rh_waived to cope better with the CVE mitigations case
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/8a35d9b408eeb4798a147fb76eb3f10368133de8
+ 8a35d9b408eeb4798a147fb76eb3f10368133de8 efi: x86: Set the NX-compatibility flag in the PE header

-https://gitlab.com/cki-project/kernel-ark/-/commit/cf18c49636f2583c85831f909699034026325242
- cf18c49636f2583c85831f909699034026325242 rh_messages.h: add missing aacraid device
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e42a2e6c9c035388d705b3cec7bf130346b632cc
+ e42a2e6c9c035388d705b3cec7bf130346b632cc efi: libstub: ensure allocated memory to be executable

-https://gitlab.com/cki-project/kernel-ark/-/commit/26ca931184edb2c3c7f7c1951f53fa3333d9c90e
- 26ca931184edb2c3c7f7c1951f53fa3333d9c90e rh_messages.h: update unmaintained drivers
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/811844b59e9b0e4e91cfa65daaab429e0664edd7
+ 811844b59e9b0e4e91cfa65daaab429e0664edd7 efi: libstub: declare DXE services table

-https://gitlab.com/cki-project/kernel-ark/-/commit/c1c1a1b7059900f4b9b657f5189285a287160e11
- c1c1a1b7059900f4b9b657f5189285a287160e11 arm64: add early lockdown for secure boot
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ea0c997fe80f42ae5f3028581d1bad74c4a55dc3
+ ea0c997fe80f42ae5f3028581d1bad74c4a55dc3 Revert "net: bcmgenet: Use stronger register read/writes to assure ordering"

-https://gitlab.com/cki-project/kernel-ark/-/commit/a613ae52a8d9378e6fa70f697b3ce0acee220491
- a613ae52a8d9378e6fa70f697b3ce0acee220491 efi: pass secure boot mode to kernel proper
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/10744450395503f1c584313b322f52e8f8542ef0
+ 10744450395503f1c584313b322f52e8f8542ef0 ALSA: memalloc: Add fallback SG-buffer allocations for x86

-https://gitlab.com/cki-project/kernel-ark/-/commit/f869258b6b654d316e84325e46e431da4dfd04e7
- f869258b6b654d316e84325e46e431da4dfd04e7 selftests/bpf: Remove ksyms_weak_lskel test
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/46b6019e2cd4f3b778dc92eccee8facaf5b66be1
+ 46b6019e2cd4f3b778dc92eccee8facaf5b66be1 drm/i915: update new TMDS clock setting defined by VBT

-https://gitlab.com/cki-project/kernel-ark/-/commit/8b69219fe6a11766cf1a2e07dc94e56448b47824
- 8b69219fe6a11766cf1a2e07dc94e56448b47824 Simplify include Makefile.rhelver
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/1324e08de44f4f42845c6c3d3c46bfac8edb5f9e
+ 1324e08de44f4f42845c6c3d3c46bfac8edb5f9e Move the patch to the redhat directory so it doesn't end up as an applied patch

-https://gitlab.com/cki-project/kernel-ark/-/commit/c2621ac616e25a9a04fbcb8af0c1f8b2bdd8c099
- c2621ac616e25a9a04fbcb8af0c1f8b2bdd8c099 redhat: make ENABLE_WERROR also enable OBJTOOL_WERROR
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/363f7c429a6526e005366aae4e1eaa8e3b34fc1d
+ 363f7c429a6526e005366aae4e1eaa8e3b34fc1d Update Fix 'mem_section' will never be NULL gcc 12 warning to V4

-https://gitlab.com/cki-project/kernel-ark/-/commit/d28cbdeb89fe565e10fb4be8d8378153e86611f6
- d28cbdeb89fe565e10fb4be8d8378153e86611f6 main.c: fix initcall blacklisted
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/c5539841799051d17639fb1b832f7e5fc0c1c818
+ c5539841799051d17639fb1b832f7e5fc0c1c818 NFSv4.1 provide mount option to toggle trunking discovery

-https://gitlab.com/cki-project/kernel-ark/-/commit/b71ab57c8db44881edc32a124ddc2ebe536b6a4c
- b71ab57c8db44881edc32a124ddc2ebe536b6a4c arch/x86/kernel/setup.c: fix rh_check_supported
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/1526e96221f95f1dfc53d819cdf62ceecb87e8bd
+ 1526e96221f95f1dfc53d819cdf62ceecb87e8bd Add the Revert patch so that it can be applied when building dist-git for F34 and F35

-https://gitlab.com/cki-project/kernel-ark/-/commit/c4ea2384863e54e0c5582b3508518e659581ce69
- c4ea2384863e54e0c5582b3508518e659581ce69 efi,lockdown: fix kernel lockdown on Secure Boot
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/8ddc4fc30e26b182187aaf1dbcf1ed0eb99b2b11
+ 8ddc4fc30e26b182187aaf1dbcf1ed0eb99b2b11 Bluetooth: hci_core: Rate limit the logging of invalid SCO handle

-https://gitlab.com/cki-project/kernel-ark/-/commit/60b2ddeb0986e1c43a98b44a4ab414a7e2744701
- 60b2ddeb0986e1c43a98b44a4ab414a7e2744701 Revert "nvme: Return BLK_STS_TARGET if the DNR bit is set"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/d5a6eac9a6da1b26edd8d387a3a5883cefd7e5c5
+ d5a6eac9a6da1b26edd8d387a3a5883cefd7e5c5 Bluetooth: hci_event: Fix HCI_EV_VENDOR max_len

-https://gitlab.com/cki-project/kernel-ark/-/commit/860632dd288c7aa7807959a79af9159482510cd1
- 860632dd288c7aa7807959a79af9159482510cd1 Revert "nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/709cbda1fe263ee37d446ad989fd7f8c4bd1f618
+ 709cbda1fe263ee37d446ad989fd7f8c4bd1f618 Update mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12

-https://gitlab.com/cki-project/kernel-ark/-/commit/aaef2c3ee081c8980bb60fd4b7a6ed9e187d9048
- aaef2c3ee081c8980bb60fd4b7a6ed9e187d9048 Revert "nvme: decouple basic ANA log page re-read support from native multipathing"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/b6493d3f05a910b5a094a256395c9587760d73d4
+ b6493d3f05a910b5a094a256395c9587760d73d4 net: bcmgenet: Use stronger register read/writes to assure ordering

-https://gitlab.com/cki-project/kernel-ark/-/commit/5cd4353dae0ee79d13f57b7ccee85cd0bcbe4b4f
- 5cd4353dae0ee79d13f57b7ccee85cd0bcbe4b4f Revert "nvme: nvme_mpath_init remove multipath check"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/442a5cb0498230a157a4f482de2d53796a400435
+ 442a5cb0498230a157a4f482de2d53796a400435 Revert "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""

-https://gitlab.com/cki-project/kernel-ark/-/commit/656a0565ffe54f99ac1390a68c5ee7050ab6fb25
- 656a0565ffe54f99ac1390a68c5ee7050ab6fb25 redhat: automotive: define CONFIG_RH_AUTOMOTIVE
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/2151233ebcc5c33b39ed3ba2b5a848f7205d5159
+ 2151233ebcc5c33b39ed3ba2b5a848f7205d5159 drm/i915: Temporarily disable selective fetch for PSR2 on ADL-P

-https://gitlab.com/cki-project/kernel-ark/-/commit/f1025d6236c72b4fbd03940b6fa2178f2a84f418
- f1025d6236c72b4fbd03940b6fa2178f2a84f418 redhat: fix modules.order target
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/9db0837f0d0b5ddd9b81e1feb1bcbff21ae93106
+ 9db0837f0d0b5ddd9b81e1feb1bcbff21ae93106 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning

-https://gitlab.com/cki-project/kernel-ark/-/commit/6e0fa997052c92d6085a50083e75dedc0160443f
- 6e0fa997052c92d6085a50083e75dedc0160443f [redhat] rh_messages.h: driver and device updates
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f2725627148ae8c46e9d740f8b93aa2fcd1739ec
+ f2725627148ae8c46e9d740f8b93aa2fcd1739ec Revert "PCI/MSI: Mask MSI-X vectors only on success"

-https://gitlab.com/cki-project/kernel-ark/-/commit/d8822fd0573e9f254f097c1743078e4e74ac70f5
- d8822fd0573e9f254f097c1743078e4e74ac70f5 crypto: rng - Fix extrng EFAULT handling
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/2d071cdb802a028b5d3a406587b84793a4f9f141
+ 2d071cdb802a028b5d3a406587b84793a4f9f141 arm64: use common CONFIG_MAX_ZONEORDER for arm kernel

-https://gitlab.com/cki-project/kernel-ark/-/commit/c224e4b6a61af08574bb0565755ed609bf08cacb
- c224e4b6a61af08574bb0565755ed609bf08cacb crypto: sig - Disable signing
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/738aa194128ecb4b9c90db8509cfdce9db50ef3a
+ 738aa194128ecb4b9c90db8509cfdce9db50ef3a crypto: rng - Override drivers/char/random in FIPS mode

-https://gitlab.com/cki-project/kernel-ark/-/commit/39417e970be7f6bc63f34d5ed5511f7e629802c2
- 39417e970be7f6bc63f34d5ed5511f7e629802c2 crypto: rng - Ensure stdrng is tested before user-space starts
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cc927bb8f58a4a87394aeafc9688a2a3ac30fed0
+ cc927bb8f58a4a87394aeafc9688a2a3ac30fed0 random: Add hook to override device reads and getrandom(2)

-https://gitlab.com/cki-project/kernel-ark/-/commit/52be246b6342ed5b1486729fd5c5893b10549a92
- 52be246b6342ed5b1486729fd5c5893b10549a92 [redhat] rh_messages.h: Mark BlueField-4 as disabled
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/bf41f6c72439c34bfbcad7264beda9d617442362
+ bf41f6c72439c34bfbcad7264beda9d617442362 RHEL: disable io_uring support

-https://gitlab.com/cki-project/kernel-ark/-/commit/2c9e64af9fa1f8599ce05877441afcac8ac91b04
- 2c9e64af9fa1f8599ce05877441afcac8ac91b04 Update the RHEL_DIFFERENCES help string
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/1429761073806cf785dfdad697ce771a3fafb617
+ 1429761073806cf785dfdad697ce771a3fafb617 nvme: nvme_mpath_init remove multipath check

-https://gitlab.com/cki-project/kernel-ark/-/commit/beef34cb1efc34b7fbee35535c66915995d12ed1
- beef34cb1efc34b7fbee35535c66915995d12ed1 redhat: include resolve_btfids in kernel-devel
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/2a6a9d6664d8cd6b68560551f8a80898f0867364
+ 2a6a9d6664d8cd6b68560551f8a80898f0867364 nvme: decouple basic ANA log page re-read support from native multipathing

-https://gitlab.com/cki-project/kernel-ark/-/commit/1a1426b7a8df854c78385dd8ce8b74e9ee641477
- 1a1426b7a8df854c78385dd8ce8b74e9ee641477 redhat: workaround CKI cross compilation for scripts
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cc464f9399e463d2eb01bf2cb02bd94f5e888745
+ cc464f9399e463d2eb01bf2cb02bd94f5e888745 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT

-https://gitlab.com/cki-project/kernel-ark/-/commit/2c83d6cfffe1f891bf024df81be6cd41c2073ad9
- 2c83d6cfffe1f891bf024df81be6cd41c2073ad9 crypto: akcipher - Disable signing and decryption
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/9ac12152fb791934f6da2a48b14023e8d919a281
+ 9ac12152fb791934f6da2a48b14023e8d919a281 nvme: Return BLK_STS_TARGET if the DNR bit is set

-https://gitlab.com/cki-project/kernel-ark/-/commit/af93553b8d335ccf5dd4f90ab9419e497aa36a80
- af93553b8d335ccf5dd4f90ab9419e497aa36a80 crypto: dh - implement FIPS PCT
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/dbfc0e9f500e611ff0b81de7e8097493a09e252e
+ dbfc0e9f500e611ff0b81de7e8097493a09e252e REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70

-https://gitlab.com/cki-project/kernel-ark/-/commit/f0540d9d32978dff227cbb930193e8dc2557b23b
- f0540d9d32978dff227cbb930193e8dc2557b23b crypto: ecdh - disallow plain "ecdh" usage in FIPS mode
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/911eee5c10b84a68308bd7b66cd8eae863befe4f
+ 911eee5c10b84a68308bd7b66cd8eae863befe4f KEYS: Make use of platform keyring for module signature verify

-https://gitlab.com/cki-project/kernel-ark/-/commit/243ef89ad354eea332d7bfb23fd4cf259240de91
- 243ef89ad354eea332d7bfb23fd4cf259240de91 crypto: seqiv - flag instantiations as FIPS compliant
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/b180dc9bfe0a7e2311e96d8ece0d3a76877801bd
+ b180dc9bfe0a7e2311e96d8ece0d3a76877801bd Input: rmi4 - remove the need for artificial IRQ in case of HID

-https://gitlab.com/cki-project/kernel-ark/-/commit/6a23cbc588e9b9f7b2bc7250c6c6903d4d904eb1
- 6a23cbc588e9b9f7b2bc7250c6c6903d4d904eb1 [kernel] bpf: set default value for bpf_jit_harden
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cb3795056f925c08d2ef291e28503cec42a76c99
+ cb3795056f925c08d2ef291e28503cec42a76c99 ARM: tegra: usb no reset

-https://gitlab.com/cki-project/kernel-ark/-/commit/bb84b630a172d0204c8d243c57a6a1d2eae7843c
- bb84b630a172d0204c8d243c57a6a1d2eae7843c not upstream: Disable vdso getrandom when FIPS is enabled
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/bc1953d9a3f7084a7e06d0ce52d801393002dd5d
+ bc1953d9a3f7084a7e06d0ce52d801393002dd5d arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT

-https://gitlab.com/cki-project/kernel-ark/-/commit/b643998c61552fb5615268e7e529999d64d54175
- b643998c61552fb5615268e7e529999d64d54175 Add support to rh_waived cmdline boot parameter
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/5db68e40dbdafebe457a6f3a4c2956e744ec33fc
+ 5db68e40dbdafebe457a6f3a4c2956e744ec33fc Add option of 13 for FORCE_MAX_ZONEORDER

-https://gitlab.com/cki-project/kernel-ark/-/commit/a1e04b6f3580382a902256c7bf8b395b9a1be47f
- a1e04b6f3580382a902256c7bf8b395b9a1be47f rh_flags: fix failed when register_sysctl_sz rh_flags_table to kernel
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cb780b02a945bac79ffdebd87eeab665b4ad4d64
+ cb780b02a945bac79ffdebd87eeab665b4ad4d64 s390: Lock down the kernel when the IPL secure flag is set

-https://gitlab.com/cki-project/kernel-ark/-/commit/03cf1862c6221ee2a6de9a5ab25adaec6460b62e
- 03cf1862c6221ee2a6de9a5ab25adaec6460b62e [redhat] rh_flags: constify the ctl_table argument of proc_handler
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/969761f2e44ee74124393c9262c43aa411ef9010
+ 969761f2e44ee74124393c9262c43aa411ef9010 efi: Lock down the kernel if booted in secure boot mode

-https://gitlab.com/cki-project/kernel-ark/-/commit/e2708e55f9151652da80e388b4bf88c649288c0f
- e2708e55f9151652da80e388b4bf88c649288c0f redhat: rh_flags: declare proper static methods when !CONFIG_RHEL_DIFFERENCES
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/5b082b5e93ac0da9eccd3ebc307c3870dcfa8693
+ 5b082b5e93ac0da9eccd3ebc307c3870dcfa8693 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode

-https://gitlab.com/cki-project/kernel-ark/-/commit/6f593811cc1e5664f45fe2d09916eada1187e992
- 6f593811cc1e5664f45fe2d09916eada1187e992 redhat: make bnx2xx drivers unmaintained in rhel-10
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/67cf2dc78797e7f6676d4867a75f0dccc182bf4e
+ 67cf2dc78797e7f6676d4867a75f0dccc182bf4e security: lockdown: expose a hook to lock the kernel down

-https://gitlab.com/cki-project/kernel-ark/-/commit/5db8220bd67c719a20c1269233585b40f48837da
- 5db8220bd67c719a20c1269233585b40f48837da rh_flags: Rename rh_features to rh_flags
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/6636a5e389455100ffe774c548e25f65d68dc831
+ 6636a5e389455100ffe774c548e25f65d68dc831 Make get_cert_list() use efi_status_to_str() to print error messages.

-https://gitlab.com/cki-project/kernel-ark/-/commit/19ca502a0087eed65a014c6271f9bfc207d8d7eb
- 19ca502a0087eed65a014c6271f9bfc207d8d7eb kernel: rh_features: fix reading empty feature list from /proc
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/df6297f5d662243a3aceb51505ae395316ed4e92
+ df6297f5d662243a3aceb51505ae395316ed4e92 Add efi_status_to_str() and rework efi_status_to_err().

-https://gitlab.com/cki-project/kernel-ark/-/commit/ba24639032f00b47748a6f39a4eb33950df015c2
- ba24639032f00b47748a6f39a4eb33950df015c2 rh_features: move rh_features entry to sys/kernel
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/927292870f81cdd73f2fc25f63e224455cd882b3
+ 927292870f81cdd73f2fc25f63e224455cd882b3 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT

-https://gitlab.com/cki-project/kernel-ark/-/commit/883e43fe6a0da0d9ad90e7c997a95f11bab9b888
- 883e43fe6a0da0d9ad90e7c997a95f11bab9b888 rh_features: convert to atomic allocation
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f0dbf9b43d38b054812b2f69cff81c110edcf348
+ f0dbf9b43d38b054812b2f69cff81c110edcf348 iommu/arm-smmu: workaround DMA mode issues

-https://gitlab.com/cki-project/kernel-ark/-/commit/c8daa2e832df14ee9174435a357b2ae0994a3ef3
- c8daa2e832df14ee9174435a357b2ae0994a3ef3 add rh_features to /proc
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/d6f9d6b208a2378f12a5ebb214844b0924500d70
+ d6f9d6b208a2378f12a5ebb214844b0924500d70 ipmi: do not configure ipmi for HPE m400

-https://gitlab.com/cki-project/kernel-ark/-/commit/4f33dbbe3ec578d49e12c07421b913bf480fccef
- 4f33dbbe3ec578d49e12c07421b913bf480fccef add support for rh_features
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/1d4597b7b8f1c20ac6d1d3845bb0336cedf066f3
+ 1d4597b7b8f1c20ac6d1d3845bb0336cedf066f3 ahci: thunderx2: Fix for errata that affects stop engine

-https://gitlab.com/cki-project/kernel-ark/-/commit/53a5900b05260b81f13eb3b9d6a9419429f310ab
- 53a5900b05260b81f13eb3b9d6a9419429f310ab [redhat] PCI: Fix pci_rh_check_status() call semantics
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/2a4dda2b720549af21fb82c101686c59b0a9c327
+ 2a4dda2b720549af21fb82c101686c59b0a9c327 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon

-https://gitlab.com/cki-project/kernel-ark/-/commit/aeb9a237a0ec39b7bde89d8bb040cd5b267f6802
- aeb9a237a0ec39b7bde89d8bb040cd5b267f6802 scsi: sd: condition probe_type under RHEL_DIFFERENCES
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/fc99e0531403fb88b37e6c61268d76efc9b1387f
+ fc99e0531403fb88b37e6c61268d76efc9b1387f tags.sh: Ignore redhat/rpm

-https://gitlab.com/cki-project/kernel-ark/-/commit/159e72af8b1631b720f4a7e0012fa624764cecde
- 159e72af8b1631b720f4a7e0012fa624764cecde scsi: sd: remove unused sd_probe_types
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f73056738cf5539edc6eac008a18013937c63013
+ f73056738cf5539edc6eac008a18013937c63013 put RHEL info into generated headers

-https://gitlab.com/cki-project/kernel-ark/-/commit/d8c04860eb7bf29617ca1754f1076fd9f5992e77
- d8c04860eb7bf29617ca1754f1076fd9f5992e77 [redhat] rh_messages.h: mark mlx5 on Bluefield-3 as unmaintained
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/fd88613d6c9440505a1163a7d9f8ec538d174693
+ fd88613d6c9440505a1163a7d9f8ec538d174693 aarch64: acpi scan: Fix regression related to X-Gene UARTs

-https://gitlab.com/cki-project/kernel-ark/-/commit/496c64b4afece4ab525467a6be71ffe60d0c564f
- 496c64b4afece4ab525467a6be71ffe60d0c564f [redhat] rh_messages.h: initial driver and device lists
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/0289a4802cb35c5b020a2e29bda909196d41b829
+ 0289a4802cb35c5b020a2e29bda909196d41b829 ACPI / irq: Workaround firmware issue on X-Gene based m400

-https://gitlab.com/cki-project/kernel-ark/-/commit/5cf456aaba6f5c9406421c04c65d43b2c71f5927
- 5cf456aaba6f5c9406421c04c65d43b2c71f5927 arch/x86: Fix XSAVE check for x86_64-v2 check
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/eb6e7ccfc9efc83233d454ff3243c51049dda35e
+ eb6e7ccfc9efc83233d454ff3243c51049dda35e modules: add rhelversion MODULE_INFO tag

-https://gitlab.com/cki-project/kernel-ark/-/commit/252bf9586fca6e57a51966c0294a9a0cb33ff4f5
- 252bf9586fca6e57a51966c0294a9a0cb33ff4f5 arch/x86/kernel/setup.c: fixup rh_check_supported
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/a46e7d8d11b3506b198e3a6c358950c5309638a8
+ a46e7d8d11b3506b198e3a6c358950c5309638a8 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support

-https://gitlab.com/cki-project/kernel-ark/-/commit/30faf17591afbd4230d590355351044294ad43d2
- 30faf17591afbd4230d590355351044294ad43d2 lsm: update security_lock_kernel_down
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/fab8720f02633b2d8b1d0df2351a73c6b5db6449
+ fab8720f02633b2d8b1d0df2351a73c6b5db6449 Introduce CONFIG_RH_DISABLE_DEPRECATED

-https://gitlab.com/cki-project/kernel-ark/-/commit/e88ee9e2e869e7259faa5bf3ff6689becabb53cb
- e88ee9e2e869e7259faa5bf3ff6689becabb53cb arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ef2ae19ad4a99580b912338c8b2b5ad44c784578
+ ef2ae19ad4a99580b912338c8b2b5ad44c784578 Pull the RHEL version defines out of the Makefile

-https://gitlab.com/cki-project/kernel-ark/-/commit/26ebc304df38a49ce7cc69b4bdf220298cff2460
- 26ebc304df38a49ce7cc69b4bdf220298cff2460 redhat: kABI: add missing RH_KABI_SIZE_ALIGN_CHECKS Kconfig option
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8c71392703448be8e8217592dd46ea1cc8b157e1
- 8c71392703448be8e8217592dd46ea1cc8b157e1 redhat: rh_kabi: introduce RH_KABI_EXCLUDE_WITH_SIZE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/d42afcb843fcc87e59ba39b5574c18d89fd07a91
- d42afcb843fcc87e59ba39b5574c18d89fd07a91 redhat: rh_kabi: move semicolon inside __RH_KABI_CHECK_SIZE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/95a56955f9ba6ef1e1dd2d99d8f98254da274267
- 95a56955f9ba6ef1e1dd2d99d8f98254da274267 random: replace import_single_range() with import_ubuf()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/92d6612578b79fd3a09e10504ed71209ba43c271
- 92d6612578b79fd3a09e10504ed71209ba43c271 ext4: Mark mounting fs-verity filesystems as tech-preview
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5c51745b8aec113ff0605ab833c3e472d99c55c8
- 5c51745b8aec113ff0605ab833c3e472d99c55c8 erofs: Add tech preview markers at mount
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6d687c70a7eda10eac0ddc6eedeaccc30eef5349
- 6d687c70a7eda10eac0ddc6eedeaccc30eef5349 kernel/rh_messages.c: Mark functions as possibly unused
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/dfb09b1d833cad815ea2f5cb69505010de260c40
- dfb09b1d833cad815ea2f5cb69505010de260c40 crypto: rng - Override drivers/char/random in FIPS mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ddbe3667f2462817f3f936141fff08604dde1564
- ddbe3667f2462817f3f936141fff08604dde1564 random: Add hook to override device reads and getrandom(2)
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/92525a9129d85fa6400c9e653379862a67cb43b2
- 92525a9129d85fa6400c9e653379862a67cb43b2 [redhat] kernel/rh_messages.c: move hardware tables to rh_messages.h
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/eacd81fdaf31d456a82c553735faf64c8efad2eb
- eacd81fdaf31d456a82c553735faf64c8efad2eb [redhat] kernel/rh_messages.c: Wire up new calls
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/32af8640a651c642ee5706dda0cf35ff508bcdcb
- 32af8640a651c642ee5706dda0cf35ff508bcdcb [redhat] drivers/pci: Update rh_messages.c
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/db366977f9e13f903cc9b7f22936b581594a7731
- db366977f9e13f903cc9b7f22936b581594a7731 [redhat] drivers/pci: Remove RHEL-only pci_hw_*() functions
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/402504ff66e5d118b514253df5d55f8413e2e167
- 402504ff66e5d118b514253df5d55f8413e2e167 scsi: sd: Add "probe_type" module parameter to allow synchronous probing
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5e96a345c6fb24e282ce1769223c1a339d0dbe94
- 5e96a345c6fb24e282ce1769223c1a339d0dbe94 Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ce943989ae8cb2b8e0b4699c148584d3cd18ec9b
- ce943989ae8cb2b8e0b4699c148584d3cd18ec9b kernel/rh_messages.c: Another gcc12 warning on redundant NULL test
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c0624b3913d8c3f262e20910a2f2c4d2f99ce61f
- c0624b3913d8c3f262e20910a2f2c4d2f99ce61f Enable IO_URING for RHEL
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/861f2d38d82cfb374799ec517f18cc021701068e
- 861f2d38d82cfb374799ec517f18cc021701068e Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e02ec93117d6eea21e80baf69e6f9848cf1a9774
- e02ec93117d6eea21e80baf69e6f9848cf1a9774 redhat: version two of Makefile.rhelver tweaks
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/964e830b4fae678dec5b8b93dcd402c73fdf2912
- 964e830b4fae678dec5b8b93dcd402c73fdf2912 redhat:  adapt to upstream Makefile change
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/60a4025a3b1cdec1c7bbdabf1e30278f615bb493
- 60a4025a3b1cdec1c7bbdabf1e30278f615bb493 kernel/rh_messages.c: gcc12 warning on redundant NULL test
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a5c9e3c6e3dcda60b5f753d1bae86a686f3ac087
- a5c9e3c6e3dcda60b5f753d1bae86a686f3ac087 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/092e751fe418623c5ad04e77fa6c993d48d96533
- 092e751fe418623c5ad04e77fa6c993d48d96533 ARK: Remove code marking devices unmaintained
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c27fa327fb3de69773568d211fd2f8f13a72e342
- c27fa327fb3de69773568d211fd2f8f13a72e342 rh_message: Fix function name
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c9b07fd3a141ad0283d7eaadf5a06aec9af2b8c9
- c9b07fd3a141ad0283d7eaadf5a06aec9af2b8c9 Add Partner Supported taint flag to kAFS
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6b0e3a47ec436527a736c0e7159b41624d176dd9
- 6b0e3a47ec436527a736c0e7159b41624d176dd9 Add Partner Supported taint flag
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/3a4e2ad92c430d2f584f56ca686bc75a469d06c0
- 3a4e2ad92c430d2f584f56ca686bc75a469d06c0 kabi: Add kABI macros for enum type
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/04fbd46f834f3a012ca9d5bef91db377a3dbaed0
- 04fbd46f834f3a012ca9d5bef91db377a3dbaed0 kabi: expand and clarify documentation of aux structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/cf8df8ef88e094ebb049a7e1e6fec069aaf54faa
- cf8df8ef88e094ebb049a7e1e6fec069aaf54faa kabi: introduce RH_KABI_USE_AUX_PTR
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/31779ca0c6c9aab28184a42ac3f17ac219b37b2b
- 31779ca0c6c9aab28184a42ac3f17ac219b37b2b kabi: rename RH_KABI_SIZE_AND_EXTEND to AUX
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/2e12a05d339ed936b9cd59f420b161d70b4a130a
- 2e12a05d339ed936b9cd59f420b161d70b4a130a kabi: more consistent _RH_KABI_SIZE_AND_EXTEND
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/b83556eebdc2efdc2d2c22610b7cd7c5cafb2bae
- b83556eebdc2efdc2d2c22610b7cd7c5cafb2bae kabi: use fixed field name for extended part
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4c9a3b306a34ed7017e35b0de26b2d98e1a04373
- 4c9a3b306a34ed7017e35b0de26b2d98e1a04373 kabi: fix dereference in RH_KABI_CHECK_EXT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a961660df0a73bcf2dcd8cb8855c2f5d5ded0ae9
- a961660df0a73bcf2dcd8cb8855c2f5d5ded0ae9 kabi: fix RH_KABI_SET_SIZE macro
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9f9ef5e8b4694fa7fb6a8f941fb741121fe5aab3
- 9f9ef5e8b4694fa7fb6a8f941fb741121fe5aab3 kabi: expand and clarify documentation
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/308d17beeaa6cb4a514f77319b636c9a2c15f5eb
- 308d17beeaa6cb4a514f77319b636c9a2c15f5eb kabi: make RH_KABI_USE replace any number of reserved fields
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f3d12dffffeee8d6692be46044b9fc8448901692
- f3d12dffffeee8d6692be46044b9fc8448901692 kabi: rename RH_KABI_USE2 to RH_KABI_USE_SPLIT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/520e726b4e78101e73fa3d77cdcbc21d204a75a9
- 520e726b4e78101e73fa3d77cdcbc21d204a75a9 kabi: change RH_KABI_REPLACE2 to RH_KABI_REPLACE_SPLIT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/7160868bd40d04e6d1a80f55d1bf9bb62ede0ba3
- 7160868bd40d04e6d1a80f55d1bf9bb62ede0ba3 kabi: change RH_KABI_REPLACE_UNSAFE to RH_KABI_BROKEN_REPLACE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0b83063cf6c57dc20a80c35396fa425ec1963d53
- 0b83063cf6c57dc20a80c35396fa425ec1963d53 kabi: introduce RH_KABI_ADD_MODIFIER
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/d276c2393792e3eec80a73a4fe964f9ec11145a7
- d276c2393792e3eec80a73a4fe964f9ec11145a7 kabi: Include kconfig.h
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/28c30de9c771ff91994c9f0a42bdcc260fa97c2d
- 28c30de9c771ff91994c9f0a42bdcc260fa97c2d kabi: macros for intentional kABI breakage
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9b671c725ac69c47874321e5636e6541bb6d219d
- 9b671c725ac69c47874321e5636e6541bb6d219d kabi: fix the note about terminating semicolon
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6443eef17fb53f62886ecce519b6e12dd310e7f5
- 6443eef17fb53f62886ecce519b6e12dd310e7f5 kabi: introduce RH_KABI_HIDE_INCLUDE and RH_KABI_FAKE_INCLUDE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/47746fc3837b476ec265e2a0c2aaa86de0d3994e
- 47746fc3837b476ec265e2a0c2aaa86de0d3994e pci.h: Fix static include
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/67ce66385c6b619356c4030e6163c4fb18a50427
- 67ce66385c6b619356c4030e6163c4fb18a50427 drivers/pci/pci-driver.c: Fix if/ifdef typo
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0dfd7feeadc964ef2a9d118218b54831381c8d7a
- 0dfd7feeadc964ef2a9d118218b54831381c8d7a kernel/rh_taint.c: Update to new messaging
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/35e5ee153637e59c9297c9cc8ba7f3960277ffc2
- 35e5ee153637e59c9297c9cc8ba7f3960277ffc2 redhat: Add mark_driver_deprecated()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ff7aa8cae4c7e3e7bbc1bb5612efc2157c81fa7d
- ff7aa8cae4c7e3e7bbc1bb5612efc2157c81fa7d RHEL: disable io_uring support
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/517351ed810bf2707e7fdb2ab22029aeb594db59
- 517351ed810bf2707e7fdb2ab22029aeb594db59 bpf: Fix unprivileged_bpf_disabled setup
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/48fe2e5f40c901e92d1f8c62bc97f58af4b0906a
- 48fe2e5f40c901e92d1f8c62bc97f58af4b0906a nvme: nvme_mpath_init remove multipath check
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/1c9bd09f303e2c9d2c67fdc46604d94e00cbf67c
- 1c9bd09f303e2c9d2c67fdc46604d94e00cbf67c wireguard: disable in FIPS mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/57872981891fe8f3f7205daa4b78c8c0d676b171
- 57872981891fe8f3f7205daa4b78c8c0d676b171 nvme: decouple basic ANA log page re-read support from native multipathing
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0561f5953431ff471193611cd73af65dd394c8cd
- 0561f5953431ff471193611cd73af65dd394c8cd nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f801483d711fa5f83a0f9d4c479eeba702d1d477
- f801483d711fa5f83a0f9d4c479eeba702d1d477 nvme: Return BLK_STS_TARGET if the DNR bit is set
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4f2bc09956ad4829d139e9d69b86ba8b9ebc66e2
- 4f2bc09956ad4829d139e9d69b86ba8b9ebc66e2 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/65a21d545cc43328ea00fdbd62e7b45f375adce8
- 65a21d545cc43328ea00fdbd62e7b45f375adce8 redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/1c1b5380b0b56d3be978997b128f84aeb9906656
- 1c1b5380b0b56d3be978997b128f84aeb9906656 arch/x86: Remove vendor specific CPU ID checks
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f7c032c856ba6379a77b76179d0352929d6039ec
- f7c032c856ba6379a77b76179d0352929d6039ec redhat: Replace hardware.redhat.com link in Unsupported message
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9a6eb49603959cf0aab0198e13946eaee07801c3
- 9a6eb49603959cf0aab0198e13946eaee07801c3 x86: Fix compile issues with rh_check_supported()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8a605436efddfa7dbc6e007b2881fa81f17968a5
- 8a605436efddfa7dbc6e007b2881fa81f17968a5 KEYS: Make use of platform keyring for module signature verify
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c7c191f662438423a23592db42838ff550c2bdda
- c7c191f662438423a23592db42838ff550c2bdda Input: rmi4 - remove the need for artificial IRQ in case of HID
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4ae139284600cd6fef133ce7a981485ea73381ab
- 4ae139284600cd6fef133ce7a981485ea73381ab ARM: tegra: usb no reset
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8156e2102f753bbe0f0dd222a5f232e7f3d99883
- 8156e2102f753bbe0f0dd222a5f232e7f3d99883 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/823e733a88ddd21c735288dd3b08348e79872b91
- 823e733a88ddd21c735288dd3b08348e79872b91 redhat: rh_kabi: deduplication friendly structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/61d2a751fe1b1305684d6c1899f26fa9e38ac0a9
- 61d2a751fe1b1305684d6c1899f26fa9e38ac0a9 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/7d09cb3ea3dd2f3cda5a6a31be429f259106ca61
- 7d09cb3ea3dd2f3cda5a6a31be429f259106ca61 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c0c51c6f123df02948e11680d9b90324593ba547
- c0c51c6f123df02948e11680d9b90324593ba547 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/96b20c70b39cd28efcec2336417cb0db9ff7853c
- 96b20c70b39cd28efcec2336417cb0db9ff7853c redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/198030a81d85dbac8f4030e69d3d376327433487
- 198030a81d85dbac8f4030e69d3d376327433487 redhat: rh_kabi: Add macros to size and extend structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/695af00ed9e393abe88d9ee4de3702c15ded186d
- 695af00ed9e393abe88d9ee4de3702c15ded186d Removing Obsolete hba pci-ids from rhel8
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/736038bd8039d1543468c1dc8925f20929645804
- 736038bd8039d1543468c1dc8925f20929645804 mptsas: pci-id table changes
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/83cdf2924bdcc90c433a58129b4501e10b1295dc
- 83cdf2924bdcc90c433a58129b4501e10b1295dc mptspi: pci-id table changes
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0b634d81ed7f0730e13d720508dbaa6ab94e54d2
- 0b634d81ed7f0730e13d720508dbaa6ab94e54d2 qla2xxx: Remove PCI IDs of deprecated adapter
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0d11491f9e7fe0c8c301db3256cb47c66ae8450f
- 0d11491f9e7fe0c8c301db3256cb47c66ae8450f hpsa: remove old cciss-based smartarray pci ids
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/75f69a4f7b8f9d38c5efb0231186ed8726e526f2
- 75f69a4f7b8f9d38c5efb0231186ed8726e526f2 kernel: add SUPPORT_REMOVED kernel taint
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/50081b0865239d853d77bc71e54d13fad8bac9f0
- 50081b0865239d853d77bc71e54d13fad8bac9f0 Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/dc84f3cc1b19a0524e58a382c382f34081dc6c35
- dc84f3cc1b19a0524e58a382c382f34081dc6c35 s390: Lock down the kernel when the IPL secure flag is set
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/cb55378c04d6516f303e98061ec7ddd6563429a8
- cb55378c04d6516f303e98061ec7ddd6563429a8 efi: Lock down the kernel if booted in secure boot mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9b06e1f07c3cc9e1d0533b8615426d4d5d9e4ebb
- 9b06e1f07c3cc9e1d0533b8615426d4d5d9e4ebb efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/db249925c6802b38d910927e4d032af1e00bee56
- db249925c6802b38d910927e4d032af1e00bee56 security: lockdown: expose a hook to lock the kernel down
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f9604bcd305aba2a94e713ee758a51143687ae9f
- f9604bcd305aba2a94e713ee758a51143687ae9f Make get_cert_list() use efi_status_to_str() to print error messages.
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/b75eb3e922c93d78d4190a759f5725e856d35439
- b75eb3e922c93d78d4190a759f5725e856d35439 Add efi_status_to_str() and rework efi_status_to_err().
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/2f80042d6b8199fceadf3623243402066e0cd4ea
- 2f80042d6b8199fceadf3623243402066e0cd4ea Add support for deprecating processors
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5a3b4f5754788e42db8ed550b359382b600f2b08
- 5a3b4f5754788e42db8ed550b359382b600f2b08 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/36cd5d0a0aa0a3be8ac385ca8991563c9e58227f
- 36cd5d0a0aa0a3be8ac385ca8991563c9e58227f iommu/arm-smmu: workaround DMA mode issues
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ca34010e072550c8d5ea57f9436bab254c3521cc
- ca34010e072550c8d5ea57f9436bab254c3521cc rh_kabi: introduce RH_KABI_EXCLUDE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/26054e2c4e2253fe955a351971dc6b931cb68961
- 26054e2c4e2253fe955a351971dc6b931cb68961 ipmi: do not configure ipmi for HPE m400
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9cb0f734492a21a7e506d7145caf143ccd927b2a
- 9cb0f734492a21a7e506d7145caf143ccd927b2a kABI: Add generic kABI macros to use for kABI workarounds
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4960e5ee4a0e9bb28e512eb35cfa633ac4552049
- 4960e5ee4a0e9bb28e512eb35cfa633ac4552049 add pci_hw_vendor_status()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/291c4e2878431fd6937c5b9248babe8ec8d4233e
- 291c4e2878431fd6937c5b9248babe8ec8d4233e ahci: thunderx2: Fix for errata that affects stop engine
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/996869cc0b3e78cb9182a4ebced2c46ee2774935
- 996869cc0b3e78cb9182a4ebced2c46ee2774935 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c1c7a887998ab12c5a1180c4bca3b41c31fe4aa6
- c1c7a887998ab12c5a1180c4bca3b41c31fe4aa6 bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e40c9d10474d1a5b5f7f01175a72ba4a3c7f5e8e
- e40c9d10474d1a5b5f7f01175a72ba4a3c7f5e8e add Red Hat-specific taint flags
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f23f446b724fbb79c1e09a278fcb427fc29c0c05
- f23f446b724fbb79c1e09a278fcb427fc29c0c05 tags.sh: Ignore redhat/rpm
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a68aa65a20fba1908a7326e5321ce8bc39a9ae14
- a68aa65a20fba1908a7326e5321ce8bc39a9ae14 put RHEL info into generated headers
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/80937f1973d73fccdc75db4026fbed7cba16f489
- 80937f1973d73fccdc75db4026fbed7cba16f489 aarch64: acpi scan: Fix regression related to X-Gene UARTs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/3362fd10fe075b48ff8af023da5643bc9477a4c6
- 3362fd10fe075b48ff8af023da5643bc9477a4c6 ACPI / irq: Workaround firmware issue on X-Gene based m400
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ffc66b174954abecfb360dcc3b98c3139ef12d96
- ffc66b174954abecfb360dcc3b98c3139ef12d96 modules: add rhelversion MODULE_INFO tag
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/7e469c23b8f648d79e8a0e82ee41cda0e50b2f19
- 7e469c23b8f648d79e8a0e82ee41cda0e50b2f19 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a0f49117d038de2d4db4940f5f039addb2f7231d
- a0f49117d038de2d4db4940f5f039addb2f7231d Add Red Hat tainting
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/fa67c16e780ed355f9847da90e8055ad1175c238
- fa67c16e780ed355f9847da90e8055ad1175c238 Introduce CONFIG_RH_DISABLE_DEPRECATED
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e7e1371803470a7840dc61da628cb912834ec149
- e7e1371803470a7840dc61da628cb912834ec149 Pull the RHEL version defines out of the Makefile
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/84d1d3e3d0c2c7ed1f571c8495bad3b4d97cfa8e
- 84d1d3e3d0c2c7ed1f571c8495bad3b4d97cfa8e [initial commit] Add Red Hat variables in the top level makefile
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/5c9b05aa2b52594f00c79370ea7bc88c5bed1dc2
+ 5c9b05aa2b52594f00c79370ea7bc88c5bed1dc2 [initial commit] Add Red Hat variables in the top level makefile

--- a/39
+++ b/39
@ -41,8 +41,7 @@ def load_symvers(symvers, filename):
            break
        if in_line == "\n":
            continue
-        checksum, symbol, directory, type, *ns = in_line.split()
-        ns = ns[0] if ns else None
+        checksum, symbol, directory, type = in_line.split()

        symvers[symbol] = in_line[0:-1]

@ -58,8 +57,7 @@ def load_kabi(kabi, filename):
            break
        if in_line == "\n":
            continue
-        checksum, symbol, directory, type, *ns = in_line.split()
-        ns = ns[0] if ns else None
+        checksum, symbol, directory, type = in_line.split()

        kabi[symbol] = in_line[0:-1]

@ -71,14 +69,11 @@ def check_kabi(symvers, kabi):
    warn = 0
    changed_symbols = []
    moved_symbols = []
-    ns_symbols = []

    for symbol in kabi:
-        abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split()
-        abi_ns = abi_ns[0] if abi_ns else None
+        abi_hash, abi_sym, abi_dir, abi_type = kabi[symbol].split()
        if symbol in symvers:
-            sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split()
-            sym_ns = sym_ns[0] if sym_ns else None
+            sym_hash, sym_sym, sym_dir, sym_type = symvers[symbol].split()
            if abi_hash != sym_hash:
                fail = 1
                changed_symbols.append(symbol)
@ -86,10 +81,6 @@ def check_kabi(symvers, kabi):
            if abi_dir != sym_dir:
                warn = 1
                moved_symbols.append(symbol)
-
-            if abi_ns != sym_ns:
-                warn = 1
-                ns_symbols.append(symbol)
        else:
            fail = 1
            changed_symbols.append(symbol)
@ -105,21 +96,13 @@ def check_kabi(symvers, kabi):

    if warn:
        print("*** WARNING - ABI SYMBOLS MOVED ***")
-        if moved_symbols:
-            print("")
-            print("The following symbols moved (typically caused by moving a symbol from being")
-            print("provided by the kernel vmlinux out to a loadable module):")
-            print("")
-            for symbol in moved_symbols:
-                print(symbol)
-            print("")
-        if ns_symbols:
-            print("")
-            print("The following symbols changed symbol namespaces:")
-            print("")
-            for symbol in ns_symbols:
-                print(symbol)
-            print("")
+        print("")
+        print("The following symbols moved (typically caused by moving a symbol from being")
+        print("provided by the kernel vmlinux out to a loadable module):")
+        print("")
+        for symbol in moved_symbols:
+            print(symbol)
+        print("")

    """Halt the build, if we got errors and/or warnings. In either case,
       double-checkig is required to avoid introducing / concealing
--- a/cpupower.config
+++ b/cpupower.config
@ -0,0 +1,3 @@
+# See 'cpupower help' and cpupower(1) for more info
+CPUPOWER_START_OPTS="frequency-set -g performance"
+CPUPOWER_STOP_OPTS="frequency-set -g ondemand"
--- a/cpupower.service
+++ b/cpupower.service
@ -0,0 +1,13 @@
+[Unit]
+Description=Configure CPU power related settings
+After=syslog.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/sysconfig/cpupower
+ExecStart=/usr/bin/cpupower $CPUPOWER_START_OPTS
+ExecStop=/usr/bin/cpupower $CPUPOWER_STOP_OPTS
+
+[Install]
+WantedBy=multi-user.target
--- a/def_variants.yaml.fedora
+++ b/def_variants.yaml.fedora
@ -1,467 +0,0 @@
-packages:
-  - name: modules-core
-    depends-on: []
-  - name: modules
-    depends-on:
-    - modules-core
-  - name: modules-internal
-    depends-on:
-    - modules-core
-    - modules
-  - name: modules-extra
-    depends-on:
-    - modules-core
-    - modules
-
-
-rules:
-  - .*kunit.*: modules-internal
-    exact_pkg: True
-  - .*test[^/]*.ko: modules-internal
-
-  - arch/.*: modules-core
-  - crypto/.*: modules-core
-
-  - drivers/accel/.*: modules-core
-  - drivers/accessibility/.*: modules-core
-  - drivers/acpi/video.*: modules
-  - drivers/acpi/.*: modules-core
-  - drivers/ata/.*: modules-core
-
-  - drivers/base/regmap/regmap-sdw.*: modules
-  - drivers/base/.*: modules-core
-  - drivers/block/floppy.*: modules-extra
-  - drivers/block/rnbd.*: modules
-  - drivers/block/.*: modules-core
-  - drivers/bus/.*: modules-core
-
-  - drivers/cdx/.*: modules-core
-  - drivers/char/mwave.*: modules
-  - drivers/char/.*: modules-core
-  - drivers/clk/.*: modules-core
-  - drivers/counter/.*: modules-core
-  - drivers/cpufreq/.*: modules-core
-  - drivers/crypto/caam/.*: modules
-  - drivers/crypto/cavium/.*: modules
-  - drivers/crypto/chelsio/.*: modules
-  - drivers/crypto/hisilicon/.*: modules
-  - drivers/crypto/marvell/.*: modules
-  - drivers/crypto/.*: modules-core
-  - drivers/cxl/.*: modules-core
-
-  - drivers/dax/.*: modules-core
-  - drivers/dca/.*: modules-core
-  - drivers/devfreq/.*: modules-core
-  - drivers/dma/.*: modules-core
-
-  - drivers/edac/.*: modules-core
-  - drivers/extcon/.*: modules-core
-
-  - drivers/firmware/iscsi_ibft.*: modules
-  - drivers/firmware/.*: modules-core
-  - drivers/fsi/.*: modules-core
-
-  - drivers/gnss/.*: modules-core
-  - drivers/gpio/gpio-dln2.*: modules-extra
-  - drivers/gpio/gpio-ljca.*: modules
-  - drivers/gpio/.*: modules-core
-  - drivers/gpu/drm/display/drm_.*: modules-core
-  - drivers/gpu/drm/drm.*: modules-core
-  - drivers/gpu/drm/etnaviv/.*: modules-core
-  - drivers/gpu/drm/gud/.*: modules-core
-  - drivers/gpu/drm/hyperv/.*: modules-core
-  - drivers/gpu/drm/imagination/.*: modules-core
-  - drivers/gpu/drm/lima/.*: modules-core
-  - drivers/gpu/drm/mxsfb/.*: modules-core
-  - drivers/gpu/drm/panfrost/.*: modules-core
-  - drivers/gpu/drm/qxl/.*: modules-core
-  - drivers/gpu/drm/scheduler/.*: modules-core
-  - drivers/gpu/drm/solomon/.*: modules-core
-  - drivers/gpu/drm/tidss/.*: modules-core
-  - drivers/gpu/drm/tiny/.*: modules-core
-  - drivers/gpu/drm/ttm/.*: modules-core
-  - drivers/gpu/drm/udl/.*: modules-core
-  - drivers/gpu/drm/v3d/.*: modules-core
-  - drivers/gpu/drm/vgem/.*: modules-core
-  - drivers/gpu/drm/virtio/.*: modules-core
-  - drivers/gpu/drm/vkms/.*: modules-core
-  - drivers/gpu/drm/vmwgfx/.*: modules-core
-  - drivers/gpu/drm/xlnx/.*: modules-core
-  - drivers/gpu/host1x/.*: modules-core
-
-  - drivers/hid/hid-asus.*: modules
-  - drivers/hid/hid-nintendo.*: modules
-  - drivers/hid/hid-picolcd.*: modules
-  - drivers/hid/hid-playstation.*: modules
-  - drivers/hid/surface-hid.*: modules
-  - drivers/hid/hid-prodikeys.*: modules
-  - drivers/hid/.*: modules-core
-  - drivers/hte/.*: modules-core
-  - drivers/hv/.*: modules-core
-  - drivers/hwmon/asus_wmi_sensors.*: modules
-  - drivers/hwmon/dell-smm-hwmon.*: modules
-  - drivers/hwmon/hp-wmi-sensors.*: modules
-  - drivers/hwmon/intel-m10-bmc-hwmon.*: modules
-  - drivers/hwmon/nct6775.*: modules
-  - drivers/hwmon/.*: modules-core
-  - drivers/hwspinlock/.*: modules-core
-  - drivers/hwtracing/.*: modules-core
-
-  - drivers/i2c/busses/i2c-dln2.*: modules-extra
-  - drivers/i2c/busses/i2c-ljca.*: modules
-  - drivers/i2c/.*: modules-core
-  - drivers/i3c/.*: modules-core
-  - drivers/iio/adc/dln2-adc.*: modules-extra
-  - drivers/iio/accel/.*: modules
-  - drivers/iio/common/cros_ec_sensors/.*: modules
-  - drivers/iio/light/.*: modules
-  - drivers/iio/pressure/.*: modules
-  - drivers/iio/proximity/.*: modules
-  - drivers/iio/.*: modules-core
-  - drivers/input/gameport/.*: modules
-  - drivers/input/joystick/.*: modules-extra
-  - drivers/input/misc/pcspkr.*: modules-extra
-  - drivers/input/tablet/.*: modules
-  - drivers/input/touchscreen/.*: modules
-  - drivers/input/.*: modules-core
-  - drivers/interconnect/.*: modules-core
-  - drivers/iommu/.*: modules-core
-  - drivers/irqchip/.*: modules-core
-
-  - drivers/mailbox/.*: modules-core
-  - drivers/md/.*: modules-core
-  - drivers/memory/dfl-emif.*: modules
-  - drivers/memory/.*: modules-core
-  - drivers/message/fusion/mptctl.*: modules-extra
-  - drivers/message/fusion/mptfc.*: modules-extra
-  - drivers/message/fusion/.*: modules
-  - drivers/message/.*: modules-core
-  - drivers/mfd/dln2.*: modules-extra
-  - drivers/misc/.*: modules-core
-  - drivers/mux/.*: modules-core
-
-  - drivers/net/amt.ko: modules-core
-  - drivers/net/bareudp.ko: modules-core
-  - drivers/net/bonding/.*: modules-core
-  - drivers/net/can/slcan/slcan.*: modules-extra
-  - drivers/net/can/usb/ems_usb.*: modules-extra
-  - drivers/net/can/vcan.*: modules-extra
-  - drivers/net/dummy.ko: modules-core
-  - drivers/net/eql.ko: modules-core
-
-  - drivers/net/ethernet/8390/.*: modules-core
-  - drivers/net/ethernet/adi/.*: modules-core
-  - drivers/net/ethernet/agere/.*: modules-core
-  - drivers/net/ethernet/altera/.*: modules-core
-  - drivers/net/ethernet/amazon/.*: modules-core
-  - drivers/net/ethernet/amd/.*: modules-core
-  - drivers/net/ethernet/apm/.*: modules-core
-  - drivers/net/ethernet/asix/.*: modules-core
-  - drivers/net/ethernet/brocade/.*: modules-core
-  - drivers/net/ethernet/cavium/.*: modules-core
-  - drivers/net/ethernet/dnet.ko: modules-core
-  - drivers/net/ethernet/engleder/.*: modules-core
-  - drivers/net/ethernet/ethoc.ko: modules-core
-  - drivers/net/ethernet/fealnx.ko: modules-core
-  - drivers/net/ethernet/freescale/.*: modules-core
-  - drivers/net/ethernet/fungible/.*: modules-core
-  - drivers/net/ethernet/google/.*: modules-core
-  - drivers/net/ethernet/hisilicon/.*: modules-core
-  - drivers/net/ethernet/ibm/.*: modules-core
-  - drivers/net/ethernet/intel/.*: modules-core
-  - drivers/net/ethernet/jme.ko: modules-core
-  - drivers/net/ethernet/litex/.*: modules-core
-  - drivers/net/ethernet/mellanox/.*: modules-core
-  - drivers/net/ethernet/microsoft/.*: modules-core
-  - drivers/net/ethernet/natsemi/.*: modules-core
-  - drivers/net/ethernet/netronome/.*: modules-core
-  - drivers/net/ethernet/pensando/.*: modules-core
-  - drivers/net/ethernet/rocker/rocker.*: modules-internal
-  - drivers/net/ethernet/qualcomm/.*: modules-core
-  - drivers/net/ethernet/realtek/.*: modules-core
-  - drivers/net/ethernet/renesas/.*: modules-core
-  - drivers/net/ethernet/socionext/.*: modules-core
-  - drivers/net/ethernet/vertexcom/.*: modules-core
-  - drivers/net/ethernet/wangxun/.*: modules-core
-  - drivers/net/ethernet/xilinx/.*: modules-core
-
-  - drivers/net/fjes/.*: modules-core
-  - drivers/net/geneve.ko: modules-core
-  - drivers/net/gtp.ko: modules-core
-  - drivers/net/hamradio/.*: modules-extra
-  - drivers/net/hyperv/.*: modules-core
-  - drivers/net/ifb.ko: modules-core
-  - drivers/net/ipa/.*: modules-core
-  - drivers/net/ipvlan/.*: modules-core
-  - drivers/net/macsec.ko: modules-core
-  - drivers/net/macvlan.ko: modules-core
-  - drivers/net/macvtap.ko: modules-core
-  - drivers/net/mctp/.*: modules-core
-  - drivers/net/mdio.*: modules-core
-  - drivers/net/mhi_net.ko: modules-core
-  - drivers/net/mii.ko: modules-core
-  - drivers/net/net_failover.ko: modules-core
-  - drivers/net/netdevsim/netdevsim.*: modules-internal
-  - drivers/net/netconsole.ko: modules-core
-  - drivers/net/nlmon.ko: modules-core
-  - drivers/net/pcs/.*: modules-core
-  - drivers/net/phy/.*: modules-core
-  - drivers/net/rionet.ko: modules-core
-  - drivers/net/slip/slip.*: modules-extra
-  - drivers/net/sungem_phy.ko: modules-core
-  - drivers/net/tap.ko: modules-core
-  - drivers/net/team/.*: modules-core
-  - drivers/net/thunderbolt/.*: modules-core
-  - drivers/net/tun.ko: modules-core
-  - drivers/net/veth.ko: modules-core
-  - drivers/net/virtio_net.ko: modules-core
-  - drivers/net/vmxnet3/.*: modules-core
-  - drivers/net/vrf.ko: modules-core
-  - drivers/net/vsockmon.ko: modules-core
-  - drivers/net/vxlan/.*: modules-core
-  - drivers/net/wireguard/.*: modules-core
-  - drivers/net/wireless/virtual/mac80211_hwsim.*: modules-internal
-  - drivers/net/wwan/wwan_hwsim.*: modules-internal
-  - drivers/net/wwan/.*: modules-core
-  - drivers/net/xen.*: modules-core
-
-  - drivers/nvdimm/.*: modules-core
-  - drivers/nvme/host/nvme-rdma.*: modules
-  - drivers/nvme/target/nvmet-rdma.*: modules
-  - drivers/nvme/.*: modules-core
-  - drivers/nvmem/nvmem_u-boot-env.*: modules
-  - drivers/nvmem/.*: modules-core
-
-  - drivers/parport/parport_serial.*: modules
-  - drivers/parport/.*: modules-core
-  - drivers/pci/pcie/aer_inject.*: modules-extra
-  - drivers/pci/.*: modules-core
-  - drivers/perf/.*: modules-core
-  - drivers/phy/.*: modules-core
-  - drivers/pinctrl/.*: modules-core
-  - drivers/pmdomain/.*: modules-core
-  - drivers/powercap/intel_rapl_tpmi.*: modules
-  - drivers/powercap/.*: modules-core
-  - drivers/pps/.*: modules-core
-  - drivers/ptp/ptp_mock.*: modules-internal
-  - drivers/ptp/ptp_dfl_tod.*: modules
-  - drivers/ptp/.*: modules-core
-  - drivers/pwm/.*: modules-core
-
-  - drivers/rapidio/.*: modules-core
-  - drivers/regulator/arizona-micsupp.*: modules
-  - drivers/regulator/.*: modules-core
-  - drivers/remoteproc/.*: modules-core
-  - drivers/reset/.*: modules-core
-  - drivers/rpmsg/.*: modules-core
-  - drivers/rtc/.*: modules-core
-
-  - drivers/s390/.*: modules-core
-
-  - drivers/scsi/3w.*: modules-core
-  - drivers/scsi/BusLogic.ko: modules-core
-  - drivers/scsi/a100u2w.ko: modules-core
-  - drivers/scsi/advansys.ko: modules-core
-  - drivers/scsi/am53c974.ko: modules-core
-  - drivers/scsi/arcmsr.*: modules-core
-  - drivers/scsi/atp870u.ko: modules-core
-  - drivers/scsi/ch.ko: modules-core
-  - drivers/scsi/cxlflash/.*: modules-core
-  - drivers/scsi/dc395x.ko: modules-core
-  - drivers/scsi/device_handler/.*: modules-core
-  - drivers/scsi/dmx3191d.ko: modules-core
-  - drivers/scsi/elx/.*: modules-core
-  - drivers/scsi/esp_scsi.ko: modules-core
-  - drivers/scsi/fdomain.*: modules-core
-  - drivers/scsi/hpsa.ko: modules-core
-  - drivers/scsi/hptiop.ko: modules-core
-  - drivers/scsi/hv_storvsc.ko: modules-core
-  - drivers/scsi/ibmvscsi.*: modules-core
-  - drivers/scsi/initio.ko: modules-core
-  - drivers/scsi/ipr.ko: modules-core
-  - drivers/scsi/ips.ko: modules-core
-  - drivers/scsi/iscsi_tcp.ko: modules-core
-  - drivers/scsi/libfc/.*: modules-core
-  - drivers/scsi/libiscsi.*: modules-core
-  - drivers/scsi/mpi3mr/.*: modules-core
-  - drivers/scsi/mvumi.ko: modules-core
-  - drivers/scsi/myrb.ko: modules-core
-  - drivers/scsi/myrs.ko: modules-core
-  - drivers/scsi/raid_class.ko: modules-core
-  - drivers/scsi/scsi_debug.ko: modules-core
-  - drivers/scsi/scsi_transport_.*: modules-core
-  - drivers/scsi/ses.ko: modules-core
-  - drivers/scsi/smartpqi/.*: modules-core
-  - drivers/scsi/snic/.*: modules-core
-  - drivers/scsi/st.ko: modules-core
-  - drivers/scsi/stex.ko: modules-core
-  - drivers/scsi/virtio_scsi.ko: modules-core
-  - drivers/scsi/vmw_pvscsi.ko: modules-core
-  - drivers/scsi/wd719x.ko: modules-core
-  - drivers/scsi/xen-scsifront.ko: modules-core
-
-  - drivers/slimbus/.*: modules-core
-  - drivers/soc/.*: modules-core
-  - drivers/spi/spi-altera-dfl.*: modules
-  - drivers/spi/spi-dln2.*: modules-extra
-  - drivers/spi/spi-ljca.*: modules
-  - drivers/spi/.*: modules-core
-  - drivers/spmi/.*: modules-core
-
-  - drivers/target/iscsi/cxgbit/cxgbit.*: modules
-  - drivers/target/sbp/sbp_target.*: modules
-  - drivers/target/target_core_user.*: modules
-  - drivers/target/.*: modules-core
-  - drivers/tee/.*: modules-core
-  - drivers/thermal/intel/int340x_thermal/int3406_thermal.*: modules
-  - drivers/thermal/.*: modules-core
-  - drivers/thunderbolt/.*: modules-core
-
-  - drivers/ufs/.*: modules-core
-  - drivers/usb/atm/.*: modules
-  - drivers/usb/gadget/function/usb_f_midi2.*: modules
-  - drivers/usb/image/.*: modules
-  - drivers/usb/misc/trancevibrator.*: modules-extra
-  - drivers/usb/misc/.*: modules
-  - drivers/usb/serial/.*: modules
-  - drivers/usb/typec/mux/nb7vpq904m.*: modules
-  - drivers/usb/usbip/.*: modules-extra
-  - drivers/usb/.*: modules-core
-
-  - drivers/vdpa/mlx5/mlx5_vdpa.*: modules
-  - drivers/vdpa/pds/pds_vdpa.*: modules
-  - drivers/vdpa/.*: modules-core
-  - drivers/vfio/pci/mlx5/mlx5-vfio-pci.*: modules
-  - drivers/vfio/pci/pds/pds-vfio-pc.*: modules
-  - drivers/vfio/.*: modules-core
-  - drivers/vhost/.*: modules-core
-  - drivers/video/backlight/apple_bl.*: modules
-  - drivers/video/.*: modules-core
-  - drivers/virt/.*: modules-core
-  - drivers/virtio/.*: modules-core
-
-  - drivers/watchdog/iTCO_wdt.*: modules
-  - drivers/watchdog/.*: modules-core
-
-  - drivers/xen/.*: modules-core
-
-  - drivers/w1/masters/ds2482.*: modules-extra
-  - drivers/w1/masters/ds2490.*: modules-extra
-  - drivers/w1/slaves/w1_ds2408.*: modules-extra
-  - drivers/w1/slaves/w1_ds2423.*: modules-extra
-  - drivers/w1/slaves/w1_ds2431.*: modules-extra
-  - drivers/w1/slaves/w1_ds2433.*: modules-extra
-  - drivers/w1/slaves/w1_ds2780.*: modules-extra
-  - drivers/w1/slaves/w1_ds2781.*: modules-extra
-  - drivers/w1/slaves/w1_ds28e04.*: modules-extra
-  - drivers/w1/slaves/w1_smem.*: modules-extra
-  - drivers/w1/slaves/w1_therm.*: modules-extra
-
-  - fs/9p/.*: modules-core
-  - fs/afs/.*: modules-core
-  - fs/affs/affs.*: modules-extra
-  - fs/bcachefs/.*: modules-core
-  - fs/befs/befs.*: modules-extra
-  - fs/binfmt_misc.ko: modules-core
-  - fs/cachefiles/.*: modules-core
-  - fs/ceph/.*: modules-core
-  - fs/coda/coda.*: modules-extra
-  - fs/dlm/.*: modules-extra
-  - fs/erofs/.*: modules-core
-  - fs/exfat/.*: modules-core
-  - fs/f2fs/.*: modules-core
-  - fs/fat/.*: modules-core
-  - fs/fuse/cuse.*: modules-extra
-  - fs/fuse/.*: modules-core
-  - fs/gfs2/.*: modules-extra
-  - fs/isofs/.*: modules-core
-  - fs/lockd/.*: modules-core
-  - fs/netfs/.*: modules-core
-  - fs/nfs.*: modules-core
-  - fs/nilfs2/nilfs2.*: modules-extra
-  - fs/nls/.*: modules-core
-  - fs/ntfs3/.*: modules-core
-  - fs/ocfs2/.*: modules-extra
-  - fs/orangefs/.*: modules-core
-  - fs/overlayfs/.*: modules-core
-  - fs/pstore/.*: modules-core
-  - fs/smb/.*: modules-core
-  - fs/squashfs/.*: modules-core
-  - fs/sysv/.*: modules-extra
-  - fs/ubifs/.*: modules-extra
-  - fs/udf/.*: modules-core
-  - fs/ufs/.*: modules-extra
-  - fs/vboxsf/.*: modules-core
-  - fs/xfs/.*: modules-core
-  - fs/zonefs/.*: modules-core
-
-  - kernel/locking/locktorture.*: modules-internal
-  - kernel/rcu/rcuscale.*: modules-internal
-  - kernel/rcu/rcutorture.*: modules-internal
-  - kernel/rcu/refscale.*: modules-internal
-  - kernel/scftorture.*: modules-internal
-  - kernel/torture.*: modules-internal
-  - kernel/.*: modules-core
-
-  - lib/.*: modules-core
-
-  - net/802/.*: modules-core
-  - net/8021q/.*: modules-core
-  - net/9p/9pnet_rdma.ko: modules
-  - net/9p/.*: modules-core
-  - net/appletalk/appletalk.*: modules-extra
-  - net/atm/br2684.*: modules-extra
-  - net/atm/clip.*: modules-extra
-  - net/atm/lec.*: modules-extra
-  - net/atm/pppoatm.*: modules-extra
-  - net/ax25/ax25.*: modules-extra
-  - net/batman-adv/batman-adv.*: modules-extra
-  - net/bridge/.*: modules-core
-  - net/ceph/.*: modules-core
-  - net/core/pktgen.*: modules-internal
-  - net/core/.*: modules-core
-  - net/dns_resolver/.*: modules-core
-  - net/hsr/.*: modules-core
-  - net/ife/.*: modules-core
-  - net/ipv4/tcp_bic.*: modules-extra
-  - net/ipv4/tcp_highspeed.*: modules-extra
-  - net/ipv4/tcp_htcp.*: modules-extra
-  - net/ipv4/tcp_hybla.*: modules-extra
-  - net/ipv4/tcp_illinois.*: modules-extra
-  - net/ipv4/tcp_lp.*: modules-extra
-  - net/ipv4/tcp_scalable.*: modules-extra
-  - net/ipv4/tcp_vegas.*: modules-extra
-  - net/ipv4/tcp_veno.*: modules-extra
-  - net/ipv4/tcp_westwood.*: modules-extra
-  - net/ipv4/tcp_yeah.*: modules-extra
-  - net/ipv4/.*: modules-core
-  - net/ipv6/.*: modules-core
-  - net/iucv/.*: modules-core
-  - net/kcm/.*: modules-core
-  - net/key/.*: modules-core
-  - net/l2tp/l2tp_debugfs.*: modules-extra
-  - net/l2tp/l2tp_eth.*: modules-extra
-  - net/l2tp/l2tp_netlink.*: modules-extra
-  - net/l2tp/l2tp_ppp.*: modules-extra
-  - net/llc/.*: modules-core
-  - net/netfilter/.*: modules-core
-  - net/netrom/netrom.*: modules-extra
-  - net/nsh/.*: modules-core
-  - net/openvswitch/.*: modules-core
-  - net/psample/.*: modules-core
-  - net/qrtr/.*: modules-core
-  - net/rds/rds.*: modules-extra
-  - net/rose/rose.*: modules-extra
-  - net/rxrpc/.*: modules-core
-  - net/sched/.*: modules-core
-  - net/sunrpc/xprtrdma/rpcrdma.*: modules
-  - net/sunrpc/.*: modules-core
-  - net/tipc/.*: modules-core
-  - net/tls/.*: modules-core
-  - net/vmw_vsock/.*: modules-core
-  - net/xdp/.*: modules-core
-  - net/xfrm/.*: modules-core
-
-  - virt/.*: modules-core
-
-  - default: modules
--- a/def_variants.yaml.rhel
+++ b/def_variants.yaml.rhel
@ -1,486 +0,0 @@
-packages:
-  - name: modules-core
-    depends-on: []
-  - name: modules
-    depends-on:
-    - modules-core
-  - name: modules-internal
-    depends-on:
-    - modules-core
-    - modules
-  - name: modules-extra
-    depends-on:
-    - modules-core
-    - modules
-  - name: modules-partner
-    depends-on:
-    - modules-core
-    - modules
-
-rules:
-  - .*kunit.*: modules-internal
-    exact_pkg: True
-  - .*test[^/]*.ko: modules-internal
-
-  - arch/.*: modules-core
-  - block/t10-pi.ko: modules-core
-  - crypto/.*: modules-core
-
-  - drivers/accel/.*: modules-core
-  - drivers/accessibility/.*: modules-core
-  - drivers/acpi/video.*: modules
-  - drivers/acpi/.*: modules-core
-  - drivers/ata/.*: modules-core
-
-  - drivers/base/regmap/regmap-sdw.*: modules
-  - drivers/base/.*: modules-core
-  - drivers/block/floppy.*: modules-extra
-  - drivers/block/rnbd.*: modules
-  - drivers/block/.*: modules-core
-  - drivers/bus/.*: modules-core
-
-  - drivers/cdrom/.*: modules-core
-  - drivers/cdx/.*: modules-core
-  - drivers/char/mwave.*: modules
-  - drivers/char/.*: modules-core
-  - drivers/clk/.*: modules-core
-  - drivers/counter/.*: modules-core
-  - drivers/cpufreq/amd-pstate-ut.ko: modules-internal
-  - drivers/cpufreq/.*: modules-core
-  - drivers/crypto/caam/.*: modules
-  - drivers/crypto/cavium/.*: modules
-  - drivers/crypto/chelsio/.*: modules
-  - drivers/crypto/hisilicon/.*: modules
-  - drivers/crypto/marvell/.*: modules
-  - drivers/crypto/.*: modules-core
-  - drivers/cxl/.*: modules-core
-
-  - drivers/dax/.*: modules-core
-  - drivers/dca/.*: modules-core
-  - drivers/devfreq/.*: modules-core
-  - drivers/dma/.*: modules-core
-
-  - drivers/edac/.*: modules-core
-  - drivers/extcon/.*: modules-core
-
-  - drivers/firmware/iscsi_ibft.*: modules
-  - drivers/firmware/.*: modules-core
-  - drivers/fsi/.*: modules-core
-
-  - drivers/gnss/.*: modules-core
-  - drivers/gpio/gpio-dln2.*: modules-extra
-  - drivers/gpio/gpio-ljca.*: modules
-  - drivers/gpio/.*: modules-core
-  - drivers/gpu/drm/display/drm_.*: modules-core
-  - drivers/gpu/drm/drm.*: modules-core
-  - drivers/gpu/drm/etnaviv/.*: modules-core
-  - drivers/gpu/drm/gud/.*: modules-core
-  - drivers/gpu/drm/hyperv/.*: modules-core
-  - drivers/gpu/drm/imagination/.*: modules-core
-  - drivers/gpu/drm/lima/.*: modules-core
-  - drivers/gpu/drm/mxsfb/.*: modules-core
-  - drivers/gpu/drm/panfrost/.*: modules-core
-  - drivers/gpu/drm/qxl/.*: modules-core
-  - drivers/gpu/drm/scheduler/.*: modules-core
-  - drivers/gpu/drm/solomon/.*: modules-core
-  - drivers/gpu/drm/tidss/.*: modules-core
-  - drivers/gpu/drm/tiny/.*: modules-core
-  - drivers/gpu/drm/ttm/.*: modules-core
-  - drivers/gpu/drm/udl/.*: modules-core
-  - drivers/gpu/drm/v3d/.*: modules-core
-  - drivers/gpu/drm/vgem/.*: modules-core
-  - drivers/gpu/drm/virtio/.*: modules-core
-  - drivers/gpu/drm/vkms/.*: modules-core
-  - drivers/gpu/drm/vmwgfx/.*: modules-core
-  - drivers/gpu/drm/xlnx/.*: modules-core
-  - drivers/gpu/host1x/.*: modules-core
-
-  - drivers/hid/hid-asus.*: modules
-  - drivers/hid/hid-nintendo.*: modules
-  - drivers/hid/hid-picolcd.*: modules
-  - drivers/hid/hid-playstation.*: modules
-  - drivers/hid/surface-hid.*: modules
-  - drivers/hid/hid-prodikeys.*: modules
-  - drivers/hid/.*: modules-core
-  - drivers/hte/.*: modules-core
-  - drivers/hv/.*: modules-core
-  - drivers/hwmon/asus_wmi_sensors.*: modules
-  - drivers/hwmon/dell-smm-hwmon.*: modules
-  - drivers/hwmon/hp-wmi-sensors.*: modules
-  - drivers/hwmon/intel-m10-bmc-hwmon.*: modules
-  - drivers/hwmon/nct6775.*: modules
-  - drivers/hwmon/ntc_thermistor.*: modules
-  - drivers/hwmon/.*: modules-core
-  - drivers/hwspinlock/.*: modules-core
-  - drivers/hwtracing/.*: modules-core
-
-  - drivers/i2c/busses/i2c-dln2.*: modules-extra
-  - drivers/i2c/busses/i2c-ljca.*: modules
-  - drivers/i2c/.*: modules-core
-  - drivers/i3c/.*: modules-core
-  - drivers/iio/adc/dln2-adc.*: modules-extra
-  - drivers/input/gameport/.*: modules
-  - drivers/input/joystick/.*: modules-extra
-  - drivers/input/tablet/.*: modules
-  - drivers/input/touchscreen/.*: modules
-  - drivers/input/.*: modules-core
-  - drivers/interconnect/.*: modules-core
-  - drivers/iommu/.*: modules-core
-  - drivers/irqchip/.*: modules-core
-
-  - drivers/mailbox/.*: modules-core
-  - drivers/md/.*: modules-core
-  - drivers/memory/dfl-emif.*: modules
-  - drivers/memory/.*: modules-core
-  - drivers/message/fusion/mptctl.*: modules-extra
-  - drivers/message/fusion/mptfc.*: modules-extra
-  - drivers/message/fusion/.*: modules
-  - drivers/message/.*: modules-core
-  - drivers/mfd/dln2.*: modules-extra
-  - drivers/misc/.*: modules-core
-  - drivers/mux/.*: modules-core
-
-  - drivers/net/amt.ko: modules-core
-  - drivers/net/bareudp.ko: modules-core
-  - drivers/net/bonding/.*: modules-core
-  - drivers/net/can/slcan/slcan.*: modules-extra
-  - drivers/net/can/usb/ems_usb.*: modules-extra
-  - drivers/net/can/vcan.*: modules-extra
-  - drivers/net/dummy.ko: modules-core
-  - drivers/net/eql.ko: modules-core
-
-  - drivers/net/ethernet/8390/.*: modules-core
-  - drivers/net/ethernet/adi/.*: modules-core
-  - drivers/net/ethernet/agere/.*: modules-core
-  - drivers/net/ethernet/altera/.*: modules-core
-  - drivers/net/ethernet/amazon/.*: modules-core
-  - drivers/net/ethernet/amd/.*: modules-core
-  - drivers/net/ethernet/apm/.*: modules-core
-  - drivers/net/ethernet/asix/.*: modules-core
-  - drivers/net/ethernet/brocade/.*: modules-core
-  - drivers/net/ethernet/cavium/.*: modules-core
-  - drivers/net/ethernet/dnet.ko: modules-core
-  - drivers/net/ethernet/engleder/.*: modules-core
-  - drivers/net/ethernet/ethoc.ko: modules-core
-  - drivers/net/ethernet/fealnx.ko: modules-core
-  - drivers/net/ethernet/freescale/.*: modules-core
-  - drivers/net/ethernet/fungible/.*: modules-core
-  - drivers/net/ethernet/google/.*: modules-core
-  - drivers/net/ethernet/hisilicon/.*: modules-core
-  - drivers/net/ethernet/huawei/.*: modules-core
-  - drivers/net/ethernet/ibm/.*: modules-core
-  - drivers/net/ethernet/intel/.*: modules-core
-  - drivers/net/ethernet/jme.ko: modules-core
-  - drivers/net/ethernet/litex/.*: modules-core
-  - drivers/net/ethernet/mellanox/.*: modules-core
-  - drivers/net/ethernet/microsoft/.*: modules-core
-  - drivers/net/ethernet/myricom/.*: modules-core
-  - drivers/net/ethernet/natsemi/.*: modules-core
-  - drivers/net/ethernet/netronome/.*: modules-core
-  - drivers/net/ethernet/pensando/.*: modules-core
-  - drivers/net/ethernet/rocker/rocker.*: modules-internal
-  - drivers/net/ethernet/qualcomm/.*: modules-core
-  - drivers/net/ethernet/realtek/.*: modules-core
-  - drivers/net/ethernet/renesas/.*: modules-core
-  - drivers/net/ethernet/socionext/.*: modules-core
-  - drivers/net/ethernet/vertexcom/.*: modules-core
-  - drivers/net/ethernet/wangxun/.*: modules-core
-  - drivers/net/ethernet/xilinx/.*: modules-core
-
-  - drivers/net/fjes/.*: modules-core
-  - drivers/net/geneve.ko: modules-core
-  - drivers/net/gtp.ko: modules-core
-  - drivers/net/hamradio/.*: modules-extra
-  - drivers/net/hyperv/.*: modules-core
-  - drivers/net/ifb.ko: modules-core
-  - drivers/net/ipa/.*: modules-core
-  - drivers/net/ipvlan/.*: modules-core
-  - drivers/net/macsec.ko: modules-core
-  - drivers/net/macvlan.ko: modules-core
-  - drivers/net/macvtap.ko: modules-core
-  - drivers/net/mctp/.*: modules-core
-  - drivers/net/mdio.*: modules-core
-  - drivers/net/mhi_net.ko: modules-core
-  - drivers/net/mii.ko: modules-core
-  - drivers/net/net_failover.ko: modules-core
-  - drivers/net/netdevsim/netdevsim.*: modules-internal
-  - drivers/net/netconsole.ko: modules-core
-  - drivers/net/nlmon.ko: modules-core
-  - drivers/net/pcs/.*: modules-core
-  - drivers/net/phy/.*: modules-core
-  - drivers/net/rionet.ko: modules-core
-  - drivers/net/slip/slip.*: modules-extra
-  - drivers/net/sungem_phy.ko: modules-core
-  - drivers/net/tap.ko: modules-core
-  - drivers/net/team/.*: modules-core
-  - drivers/net/thunderbolt/.*: modules-core
-  - drivers/net/tun.ko: modules-core
-  - drivers/net/veth.ko: modules-core
-  - drivers/net/virtio_net.ko: modules-core
-  - drivers/net/vmxnet3/.*: modules-core
-  - drivers/net/vrf.ko: modules-core
-  - drivers/net/vsockmon.ko: modules-core
-  - drivers/net/vxlan/.*: modules-core
-  - drivers/net/wan/hdlc.*: modules-core
-  - drivers/net/wireguard/.*: modules-core
-  - drivers/net/wireless/virtual/mac80211_hwsim.*: modules-internal
-  - drivers/net/wwan/wwan_hwsim.*: modules-internal
-  - drivers/net/wwan/.*: modules-core
-  - drivers/net/xen.*: modules-core
-
-  - drivers/nvdimm/.*: modules-core
-  - drivers/nvme/host/nvme-rdma.*: modules
-  - drivers/nvme/target/nvmet-rdma.*: modules
-  - drivers/nvme/.*: modules-core
-  - drivers/nvmem/nvmem_u-boot-env.*: modules
-  - drivers/nvmem/.*: modules-core
-
-  - drivers/parport/parport_serial.*: modules
-  - drivers/parport/.*: modules-core
-  - drivers/pci/pcie/aer_inject.*: modules-extra
-  - drivers/pci/.*: modules-core
-  - drivers/perf/.*: modules-core
-  - drivers/phy/.*: modules-core
-  - drivers/pinctrl/.*: modules-core
-  - drivers/platform/x86/intel/intel_vsec.*: modules-core
-  - drivers/pmdomain/.*: modules-core
-  - drivers/powercap/intel_rapl_tpmi.*: modules
-  - drivers/powercap/.*: modules-core
-  - drivers/pps/.*: modules-core
-  - drivers/ptp/ptp_mock.*: modules-internal
-  - drivers/ptp/ptp_dfl_tod.*: modules
-  - drivers/ptp/.*: modules-core
-  - drivers/pwm/.*: modules-core
-
-  - drivers/rapidio/.*: modules-core
-  - drivers/regulator/arizona-micsupp.*: modules
-  - drivers/regulator/.*: modules-core
-  - drivers/remoteproc/.*: modules-core
-  - drivers/reset/.*: modules-core
-  - drivers/rpmsg/.*: modules-core
-  - drivers/rtc/.*: modules-core
-
-  - drivers/s390/net/ism.*: modules
-  - drivers/s390/.*: modules-core
-
-  - drivers/scsi/3w.*: modules-core
-  - drivers/scsi/BusLogic.ko: modules-core
-  - drivers/scsi/a100u2w.ko: modules-core
-  - drivers/scsi/advansys.ko: modules-core
-  - drivers/scsi/am53c974.ko: modules-core
-  - drivers/scsi/arcmsr.*: modules-core
-  - drivers/scsi/atp870u.ko: modules-core
-  - drivers/scsi/ch.ko: modules-core
-  - drivers/scsi/cxlflash/.*: modules-core
-  - drivers/scsi/dc395x.ko: modules-core
-  - drivers/scsi/device_handler/.*: modules-core
-  - drivers/scsi/dmx3191d.ko: modules-core
-  - drivers/scsi/elx/.*: modules-core
-  - drivers/scsi/esp_scsi.ko: modules-core
-  - drivers/scsi/fdomain.*: modules-core
-  - drivers/scsi/hpsa.ko: modules-core
-  - drivers/scsi/hptiop.ko: modules-core
-  - drivers/scsi/hv_storvsc.ko: modules-core
-  - drivers/scsi/ibmvscsi.*: modules-core
-  - drivers/scsi/initio.ko: modules-core
-  - drivers/scsi/ipr.ko: modules-core
-  - drivers/scsi/ips.ko: modules-core
-  - drivers/scsi/iscsi_tcp.ko: modules-core
-  - drivers/scsi/libfc/.*: modules-core
-  - drivers/scsi/libiscsi.*: modules-core
-  - drivers/scsi/mpi3mr/.*: modules-core
-  - drivers/scsi/mvumi.ko: modules-core
-  - drivers/scsi/myrb.ko: modules-core
-  - drivers/scsi/myrs.ko: modules-core
-  - drivers/scsi/raid_class.ko: modules-core
-  - drivers/scsi/scsi_debug.ko: modules-core
-  - drivers/scsi/scsi_transport_.*: modules-core
-  - drivers/scsi/sd_mod.ko: modules-core
-  - drivers/scsi/ses.ko: modules-core
-  - drivers/scsi/sg.ko: modules-core
-  - drivers/scsi/smartpqi/.*: modules-core
-  - drivers/scsi/snic/.*: modules-core
-  - drivers/scsi/sr_mod.ko: modules-core
-  - drivers/scsi/st.ko: modules-core
-  - drivers/scsi/stex.ko: modules-core
-  - drivers/scsi/virtio_scsi.ko: modules-core
-  - drivers/scsi/vmw_pvscsi.ko: modules-core
-  - drivers/scsi/wd719x.ko: modules-core
-  - drivers/scsi/xen-scsifront.ko: modules-core
-
-  - drivers/slimbus/.*: modules-core
-  - drivers/soc/.*: modules-core
-  - drivers/spi/spi-altera-dfl.*: modules
-  - drivers/spi/spi-dln2.*: modules-extra
-  - drivers/spi/spi-ljca.*: modules
-  - drivers/spi/.*: modules-core
-  - drivers/spmi/.*: modules-core
-
-  - drivers/target/iscsi/cxgbit/cxgbit.*: modules
-  - drivers/target/sbp/sbp_target.*: modules
-  - drivers/target/target_core_user.*: modules
-  - drivers/target/.*: modules-core
-  - drivers/tee/.*: modules-core
-  - drivers/thermal/intel/int340x_thermal/int3406_thermal.*: modules
-  - drivers/thermal/.*: modules-core
-  - drivers/thunderbolt/.*: modules-core
-
-  - drivers/ufs/.*: modules-core
-  - drivers/usb/atm/.*: modules
-  - drivers/usb/gadget/function/usb_f_midi2.*: modules
-  - drivers/usb/image/.*: modules
-  - drivers/usb/misc/trancevibrator.*: modules-extra
-  - drivers/usb/misc/.*: modules
-  - drivers/usb/serial/.*: modules
-  - drivers/usb/typec/mux/nb7vpq904m.*: modules
-  - drivers/usb/usbip/.*: modules-internal
-  - drivers/usb/.*: modules-core
-
-  - drivers/vdpa/mlx5/mlx5_vdpa.*: modules
-  - drivers/vdpa/pds/pds_vdpa.*: modules
-  - drivers/vdpa/.*: modules-core
-  - drivers/vfio/pci/mlx5/mlx5-vfio-pci.*: modules
-  - drivers/vfio/pci/pds/pds-vfio-pc.*: modules
-  - drivers/vfio/.*: modules-core
-  - drivers/vhost/.*: modules-core
-  - drivers/video/backlight/apple_bl.*: modules
-  - drivers/video/.*: modules-core
-  - drivers/virt/.*: modules-core
-  - drivers/virtio/.*: modules-core
-
-  - drivers/watchdog/.*: modules-core
-
-  - drivers/xen/.*: modules-core
-
-  - drivers/w1/masters/ds2482.*: modules-extra
-  - drivers/w1/masters/ds2490.*: modules-extra
-  - drivers/w1/slaves/w1_ds2408.*: modules-extra
-  - drivers/w1/slaves/w1_ds2423.*: modules-extra
-  - drivers/w1/slaves/w1_ds2431.*: modules-extra
-  - drivers/w1/slaves/w1_ds2433.*: modules-extra
-  - drivers/w1/slaves/w1_ds2780.*: modules-extra
-  - drivers/w1/slaves/w1_ds2781.*: modules-extra
-  - drivers/w1/slaves/w1_ds28e04.*: modules-extra
-  - drivers/w1/slaves/w1_smem.*: modules-extra
-  - drivers/w1/slaves/w1_therm.*: modules-extra
-
-  - fs/9p/.*: modules-core
-  - fs/afs/.*: modules-partner
-  - fs/affs/affs.*: modules-extra
-  - fs/bcachefs/.*: modules-core
-  - fs/befs/befs.*: modules-extra
-  - fs/binfmt_misc.ko: modules-core
-  - fs/cachefiles/.*: modules-core
-  - fs/ceph/.*: modules-core
-  - fs/coda/coda.*: modules-extra
-  - fs/dlm/.*: modules-core
-  - fs/erofs/.*: modules-core
-  - fs/exfat/.*: modules-core
-  - fs/ext4/.*: modules-core
-  - fs/f2fs/.*: modules-core
-  - fs/fat/.*: modules-core
-  - fs/fuse/cuse.*: modules-extra
-  - fs/fuse/.*: modules-core
-  - fs/gfs2/.*: modules-core
-  - fs/isofs/.*: modules-core
-  - fs/jbd2/.*: modules-core
-  - fs/lockd/.*: modules-core
-  - fs/mbcache.ko: modules-core
-  - fs/netfs/.*: modules-core
-  - fs/nfs.*: modules-core
-  - fs/nilfs2/nilfs2.*: modules-extra
-  - fs/nls/.*: modules-core
-  - fs/ntfs3/.*: modules-core
-  - fs/ocfs2/.*: modules-extra
-  - fs/orangefs/.*: modules-core
-  - fs/overlayfs/.*: modules-core
-  - fs/pstore/.*: modules-core
-  - fs/sysv/.*: modules-extra
-  - fs/ubifs/.*: modules-extra
-  - fs/udf/.*: modules-core
-  - fs/ufs/.*: modules-extra
-  - fs/vboxsf/.*: modules-core
-  - fs/xfs/.*: modules-core
-  - fs/zonefs/.*: modules-core
-
-  - kernel/locking/locktorture.*: modules-internal
-  - kernel/rcu/rcuscale.*: modules-internal
-  - kernel/rcu/rcutorture.*: modules-internal
-  - kernel/rcu/refscale.*: modules-internal
-  - kernel/scftorture.*: modules-internal
-  - kernel/torture.*: modules-internal
-  - kernel/.*: modules-core
-
-  - lib/.*: modules-core
-
-  - mm/zsmalloc.ko: modules-core
-
-  - net/802/.*: modules-core
-  - net/8021q/.*: modules-core
-  - net/9p/9pnet_rdma.ko: modules
-  - net/9p/.*: modules-core
-  - net/appletalk/appletalk.*: modules-extra
-  - net/atm/br2684.*: modules-extra
-  - net/atm/clip.*: modules-extra
-  - net/atm/lec.*: modules-extra
-  - net/atm/pppoatm.*: modules-extra
-  - net/ax25/ax25.*: modules-extra
-  - net/batman-adv/batman-adv.*: modules-extra
-  - net/bridge/br_netfilter.*: modules-extra
-  - net/bridge/netfilter/ebt.*: modules-extra
-  - net/bridge/.*: modules-core
-  - net/ceph/.*: modules-core
-  - net/core/pktgen.*: modules-internal
-  - net/core/.*: modules-core
-  - net/dns_resolver/.*: modules-core
-  - net/hsr/.*: modules-core
-  - net/ife/.*: modules-core
-  - net/ipv4/netfilter/arp.*: modules-extra
-  - net/ipv4/netfilter/ip[_t].*: modules-extra
-  - net/ipv4/tcp_bic.*: modules-extra
-  - net/ipv4/tcp_highspeed.*: modules-extra
-  - net/ipv4/tcp_htcp.*: modules-extra
-  - net/ipv4/tcp_hybla.*: modules-extra
-  - net/ipv4/tcp_illinois.*: modules-extra
-  - net/ipv4/tcp_lp.*: modules-extra
-  - net/ipv4/tcp_scalable.*: modules-extra
-  - net/ipv4/tcp_vegas.*: modules-extra
-  - net/ipv4/tcp_veno.*: modules-extra
-  - net/ipv4/tcp_westwood.*: modules-extra
-  - net/ipv4/tcp_yeah.*: modules-extra
-  - net/ipv4/.*: modules-core
-  - net/ipv6/netfilter/ebt.*: modules-extra
-  - net/ipv6/netfilter/ip6[_t].*: modules-extra
-  - net/ipv6/.*: modules-core
-  - net/iucv/.*: modules-core
-  - net/kcm/.*: modules-core
-  - net/key/.*: modules-core
-  - net/l2tp/.*: modules-extra
-  - net/llc/.*: modules-core
-  - net/netfilter/ipset/.*: modules-extra
-  - net/netfilter/nft_compat.*: modules-extra
-  - net/netfilter/xt_.*: modules-extra
-  - net/netfilter/.*: modules-core
-  - net/netrom/netrom.*: modules-extra
-  - net/nsh/.*: modules-core
-  - net/openvswitch/.*: modules-core
-  - net/psample/.*: modules-core
-  - net/qrtr/.*: modules-core
-  - net/rds/rds.*: modules-extra
-  - net/rose/rose.*: modules-extra
-  - net/rxrpc/.*: modules-partner
-  - net/sched/.*: modules-core
-  - net/sctp/.*: modules-extra
-  - net/sunrpc/xprtrdma/rpcrdma.*: modules
-  - net/sunrpc/.*: modules-core
-  - net/tipc/.*: modules-extra
-  - net/tls/.*: modules-core
-  - net/vmw_vsock/.*: modules-core
-  - net/xdp/.*: modules-core
-  - net/xfrm/.*: modules-core
-
-  - samples/.*: modules-internal
-
-  - virt/.*: modules-core
-
-  - default: modules
--- a/dracut-virt.conf
+++ b/dracut-virt.conf
@ -1,58 +0,0 @@
-# generic + compressed please
-hostonly="no"
-compress="xz"
-
-# VMs can't update microcode anyway
-early_microcode="no"
-
-# modules: basics
-dracutmodules+=" dracut-systemd i18n shutdown "
-
-# modules: storage support
-dracutmodules+=" dm lvm rootfs-block fs-lib "
-
-# modules: tpm and crypto
-dracutmodules+=" crypt crypt-loop tpm2-tss systemd-pcrphase "
-
-# dracut >= 102 separated systemd-cryptsetup into its own module
-CSMODULE=`dracut --list-modules --no-kernel | grep '^systemd-cryptsetup$'`
-dracutmodules+=" $CSMODULE "
-
-# modules: support root on virtiofs
-dracutmodules+=" virtiofs "
-
-# modules: use sysext images (see 'man systemd-sysext')
-dracutmodules+=" systemd-sysext "
-
-# modules: root disk integrity protection
-dracutmodules+=" systemd-veritysetup "
-
-# modules: root creation and encryption
-dracutmodules+=" systemd-repart "
-# FIXME: remove this once RHEL-103385 is merged
-install_items+=" /usr/sbin/mkfs.vfat /usr/sbin/mkfs.ext4 /usr/sbin/mkfs.xfs "
-
-# modules: FIPS
-dracutmodules+=" fips "
-# FIPS mode requires early crypto drivers test
-drivers+=" =crypto "
-
-# drivers: virtual buses, pci
-drivers+=" virtio-pci virtio-mmio "      # qemu-kvm
-drivers+=" hv-vmbus pci-hyperv "         # hyperv
-drivers+=" xen-pcifront "                # xen
-
-# drivers: storage
-drivers+=" ahci nvme sd_mod sr_mod "     # generic
-drivers+=" virtio-blk virtio-scsi "      # qemu-kvm
-drivers+=" hv-storvsc "                  # hyperv
-drivers+=" xen-blkfront "                # xen
-
-# root encryption
-drivers+=" dm_crypt "
-
-# root disk integrity protection
-drivers+=" dm_verity overlay "
-
-# filesystems
-filesystems+=" vfat ext4 xfs overlay "
--- a/fedoraimaca.x509
+++ b/fedoraimaca.x509
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@ -0,0 +1,18 @@
+#! /bin/bash
+
+# This is the aarch64 override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio w1"
+
+ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell micrel myricom neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
+
+drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i tiny vc4"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo"
--- a/filter-aarch64.sh.rhel
+++ b/filter-aarch64.sh.rhel
@ -0,0 +1,18 @@
+#! /bin/bash
+
+# This is the aarch64 override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
+
+ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
+
+drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i tinydrm vc4"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"
--- a/filter-armv7hl.sh.fedora
+++ b/filter-armv7hl.sh.fedora
@ -0,0 +1,18 @@
+#! /bin/bash
+
+# This is the armv7hl override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband media memstick message nfc ntb pcmcia ssb soundwire staging tty uio w1"
+
+ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex mellanox micrel myricom natsemi neterion nvidia packetengines qlogic rdc sfc silan sis sun tehuti via wiznet xircom"
+
+drmdrvs="amd arm armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm nouveau omapdrm panel pl111 radeon rockchip sti stm sun4i tegra tilcdc tiny vc4"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr bq27xxx_battery_hdq mlx5_vdpa dfl-emif spi-altera-dfl hid-playstation hid-nintendo"
--- a/Module.kabi_dup_riscv64
+++ b/Module.kabi_dup_riscv64
--- a/filter-modules.sh.fedora
+++ b/filter-modules.sh.fedora
@ -0,0 +1,193 @@
+#! /bin/bash
+#
+# Called as filter-modules.sh list-of-modules Arch
+
+# This script filters the modules into the kernel-core and kernel-modules
+# subpackages.  We list out subsystems/subdirs to prune from the installed
+# module directory.  What is left is put into the kernel-core package.  What is
+# pruned is contained in the kernel-modules package.
+#
+# This file contains the default subsys/subdirs to prune from all architectures.
+# If an architecture needs to differ, we source a per-arch filter-<arch>.sh file
+# that contains the set of override lists to be used instead.  If a module or
+# subsys should be in kernel-modules on all arches, please change the defaults
+# listed here.
+
+# Overrides is individual modules which need to remain in kernel-core due to deps.
+overrides="cec"
+
+# Set the default dirs/modules to filter out
+driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio w1"
+
+chardrvs="mwave pcmcia"
+
+netdrvs="appletalk can dsa hamradio ieee802154 ppp slip usb wireless"
+
+ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell mellanox neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
+
+iiodrvs="accel light pressure proximity"
+
+iiocommondrvs="cros_ec_sensors"
+
+inputdrvs="gameport tablet touchscreen"
+
+hiddrvs="surface-hid"
+
+scsidrvs="aacraid aic7xxx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic isci libsas lpfc megaraid mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf"
+
+usbdrvs="atm image misc serial"
+
+fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
+
+netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dsa ieee802154 l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
+
+drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit  chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo asus_wmi_sensors asus_wmi_ec_sensors"
+
+# Grab the arch-specific filter list overrides
+source ./filter-$2.sh
+
+filter_dir() {
+	filelist=$1
+	dir=$2
+
+	grep -v -e "${dir}/" ${filelist} > ${filelist}.tmp
+
+	if [ $? -ne 0 ]
+	then
+		echo "Couldn't remove ${dir}.  Skipping."
+	else
+		grep -e "${dir}/" ${filelist} >> k-d.list
+		mv ${filelist}.tmp $filelist
+	fi
+	
+	return 0
+}
+
+filter_ko() {
+	filelist=$1
+	mod=$2
+
+	grep -v -e "${mod}.ko" ${filelist} > ${filelist}.tmp
+
+	if [ $? -ne 0 ]
+	then
+		echo "Couldn't remove ${mod}.ko  Skipping."
+	else
+		grep -e "${mod}.ko" ${filelist} >> k-d.list
+		mv ${filelist}.tmp $filelist
+	fi
+	
+	return 0
+}
+
+# Filter the drivers/ subsystems
+for subsys in ${driverdirs}
+do
+	filter_dir $1 drivers/${subsys}
+done
+
+# Filter the networking drivers
+for netdrv in ${netdrvs}
+do
+	filter_dir $1 drivers/net/${netdrv}
+done
+
+# Filter the char drivers
+for char in ${chardrvs}
+do
+	filter_dir $1 drivers/char/${char}
+done
+
+# Filter the ethernet drivers
+for eth in ${ethdrvs}
+do
+	filter_dir $1 drivers/net/ethernet/${eth}
+done
+
+# SCSI
+for scsi in ${scsidrvs}
+do
+	filter_dir $1 drivers/scsi/${scsi}
+done
+
+# IIO
+for iio in ${iiodrvs}
+do
+        filter_dir $1 drivers/iio/${iio}
+done
+
+# IIO Common
+for iio in ${iiocommondrvs}
+do
+        filter_dir $1 drivers/iio/common/${iio}
+done
+
+# Input
+for input in ${inputdrvs}
+do
+	filter_dir $1 drivers/input/${input}
+done
+
+# hid
+for hid in ${hiddrvs}
+do
+	filter_dir $1 drivers/hid/${hid}
+done
+
+# USB
+for usb in ${usbdrvs}
+do
+	filter_dir $1 drivers/usb/${usb}
+done
+
+# Filesystems
+for fs in ${fsdrvs}
+do
+	filter_dir $1 fs/${fs}
+done
+
+# Network protocols
+for prot in ${netprots}
+do
+	filter_dir $1 kernel/net/${prot}
+done
+
+# DRM
+for drm in ${drmdrvs}
+do
+	filter_dir $1 drivers/gpu/drm/${drm}
+done
+
+# Just kill sound.
+filter_dir $1 kernel/sound
+filter_dir $1 kernel/drivers/soundwire
+
+# Now go through and filter any single .ko files that might have deps on the
+# things we filtered above
+for mod in ${singlemods}
+do
+        filter_ko $1 ${mod}
+done
+
+# Now process the override list to bring those modules back into core
+for mod in ${overrides}
+do
+	grep -v -e "/${mod}.ko" k-d.list > k-d.list.tmp
+	if [ $? -ne 0 ]
+        then
+                echo "Couldn't save ${mod}.ko  Skipping."
+        else
+                grep -e "/${mod}.ko" k-d.list >> $filelist
+                mv k-d.list.tmp k-d.list
+        fi
+
+done
+
+# Go through our generated drivers list and remove the .ko files.  We'll
+# restore them later.
+for mod in `cat k-d.list`
+do
+	rm -rf $mod
+done
--- a/filter-modules.sh.rhel
+++ b/filter-modules.sh.rhel
@ -0,0 +1,169 @@
+#! /bin/bash
+#
+# Called as filter-modules.sh list-of-modules Arch
+
+# This script filters the modules into the kernel-core and kernel-modules
+# subpackages.  We list out subsystems/subdirs to prune from the installed
+# module directory.  What is left is put into the kernel-core package.  What is
+# pruned is contained in the kernel-modules package.
+#
+# This file contains the default subsys/subdirs to prune from all architectures.
+# If an architecture needs to differ, we source a per-arch filter-<arch>.sh file
+# that contains the set of override lists to be used instead.  If a module or
+# subsys should be in kernel-modules on all arches, please change the defaults
+# listed here.
+
+# Overrides is individual modules which need to remain in kernel-core due to deps.
+overrides="cec"
+
+# Set the default dirs/modules to filter out
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
+
+chardrvs="mwave pcmcia"
+
+netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless"
+
+ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
+
+inputdrvs="gameport tablet touchscreen"
+
+scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic hisi_sas isci libsas lpfc megaraid mpt2sas mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf"
+
+usbdrvs="atm image misc serial wusbcore"
+
+fsdrvs="affs befs cifs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
+
+netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
+
+drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor"
+
+# Grab the arch-specific filter list overrides
+source ./filter-$2.sh
+
+filter_dir() {
+	filelist=$1
+	dir=$2
+
+	grep -v -e "${dir}/" ${filelist} > ${filelist}.tmp
+
+	if [ $? -ne 0 ]
+	then
+		echo "Couldn't remove ${dir}.  Skipping."
+	else
+		grep -e "${dir}/" ${filelist} >> k-d.list
+		mv ${filelist}.tmp $filelist
+	fi
+	
+	return 0
+}
+
+filter_ko() {
+	filelist=$1
+	mod=$2
+
+	grep -v -e "${mod}.ko" ${filelist} > ${filelist}.tmp
+
+	if [ $? -ne 0 ]
+	then
+		echo "Couldn't remove ${mod}.ko  Skipping."
+	else
+		grep -e "${mod}.ko" ${filelist} >> k-d.list
+		mv ${filelist}.tmp $filelist
+	fi
+	
+	return 0
+}
+
+# Filter the drivers/ subsystems
+for subsys in ${driverdirs}
+do
+	filter_dir $1 drivers/${subsys}
+done
+
+# Filter the networking drivers
+for netdrv in ${netdrvs}
+do
+	filter_dir $1 drivers/net/${netdrv}
+done
+
+# Filter the char drivers
+for char in ${chardrvs}
+do
+	filter_dir $1 drivers/char/${char}
+done
+
+# Filter the ethernet drivers
+for eth in ${ethdrvs}
+do
+	filter_dir $1 drivers/net/ethernet/${eth}
+done
+
+# SCSI
+for scsi in ${scsidrvs}
+do
+	filter_dir $1 drivers/scsi/${scsi}
+done
+
+# Input
+for input in ${inputdrvs}
+do
+	filter_dir $1 drivers/input/${input}
+done
+
+# USB
+for usb in ${usbdrvs}
+do
+	filter_dir $1 drivers/usb/${usb}
+done
+
+# Filesystems
+for fs in ${fsdrvs}
+do
+	filter_dir $1 fs/${fs}
+done
+
+# Network protocols
+for prot in ${netprots}
+do
+	filter_dir $1 kernel/net/${prot}
+done
+
+# DRM
+for drm in ${drmdrvs}
+do
+	filter_dir $1 drivers/gpu/drm/${drm}
+done
+
+# Just kill sound.
+filter_dir $1 kernel/sound
+filter_dir $1 kernel/drivers/soundwire
+
+# Now go through and filter any single .ko files that might have deps on the
+# things we filtered above
+for mod in ${singlemods}
+do
+        filter_ko $1 ${mod}
+done
+
+# Now process the override list to bring those modules back into core
+for mod in ${overrides}
+do
+	grep -v -e "/${mod}.ko" k-d.list > k-d.list.tmp
+	if [ $? -ne 0 ]
+        then
+                echo "Couldn't save ${mod}.ko  Skipping."
+        else
+                grep -e "/${mod}.ko" k-d.list >> $filelist
+                mv k-d.list.tmp k-d.list
+        fi
+
+done
+
+# Go through our generated drivers list and remove the .ko files.  We'll
+# restore them later.
+for mod in `cat k-d.list`
+do
+	rm -rf $mod
+done
--- a/filter-ppc64le.sh.fedora
+++ b/filter-ppc64le.sh.fedora
@ -0,0 +1,14 @@
+#! /bin/bash
+
+# This is the ppc64le override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio w1"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo"
--- a/filter-ppc64le.sh.rhel
+++ b/filter-ppc64le.sh.rhel
@ -0,0 +1,14 @@
+#! /bin/bash
+
+# This is the ppc64le override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"
--- a/filter-s390x.sh.fedora
+++ b/filter-s390x.sh.fedora
@ -0,0 +1,12 @@
+#! /bin/bash
+
+# This is the s390x override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+# Defaults work so no need to override
--- a/filter-s390x.sh.rhel
+++ b/filter-s390x.sh.rhel
@ -0,0 +1,12 @@
+#! /bin/bash
+
+# This is the s390x override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+# Defaults work so no need to override
--- a/filter-x86_64.sh.fedora
+++ b/filter-x86_64.sh.fedora
@ -0,0 +1,12 @@
+#! /bin/bash
+
+# This is the x86_64 override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+# Defaults work so no need to override
--- a/filter-x86_64.sh.rhel
+++ b/filter-x86_64.sh.rhel
@ -0,0 +1,12 @@
+#! /bin/bash
+
+# This is the x86_64 override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+# Defaults work so no need to override
--- a/filtermods.py
+++ b/filtermods.py
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-rhel
-fedora
--- a/gating.yaml
+++ b/gating.yaml
@ -1,14 +1,9 @@
 --- !Policy
 product_versions:
-  - rhel-*
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: cki.tier1-aarch64.functional}
  - !PassingTestCaseRule {test_case_name: cki.tier1-ppc64le.functional}
  - !PassingTestCaseRule {test_case_name: cki.tier1-s390x.functional}
  - !PassingTestCaseRule {test_case_name: cki.tier1-x86_64.functional}
-  - !PassingTestCaseRule {test_case_name: s1-aws-ci_x86_64.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: s1-aws-ci_aarch64.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: s1-azure-ci_x86_64.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: s1-azure-ci_aarch64.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: s1-gcp-ci.brew-build.tier1.functional}
--- a/generate_all_configs.sh
+++ b/generate_all_configs.sh
@ -1,38 +1,40 @@
 #!/bin/sh

 # Adjusts the configuration options to build the variants correctly
+#
+# arg1: configuration to go in the primary variant
+# arg2: are we only generating debug configs

-test -n "$RHTEST" && exit 0

-DEBUGBUILDSENABLED=$1
-if [ -z "$DEBUGBUILDSENABLED" ]; then
+PRIMARY=$1
+DEBUGBUILDSENABLED=$2
+
+if [ -z "$2" ]; then
 	exit 1
 fi

-if [ -z "$FLAVOR" ]; then
-	FLAVOR=rhel
+if [ -z "$PRIMARY" ]; then
+	PRIMARY=rhel
 fi

-if [ "$FLAVOR" = "fedora" ]; then
+if [ "$PRIMARY" = "fedora" ]; then
 	SECONDARY=rhel
 else
 	SECONDARY=fedora
 fi

-# The +1 is to remove the - at the end of the SPECPACKAGE_NAME string
-specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1))
-for i in "${SPECPACKAGE_NAME}"*-"$FLAVOR".config; do
-	# shellcheck disable=SC3057
-	NEW=${SPECPACKAGE_NAME}-"$SPECRPMVERSION"-$(echo "${i:$specpackage_name_len}" | sed s/-"$FLAVOR"//)
+for i in kernel-*-"$PRIMARY".config; do
+	NEW=kernel-"$VERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$PRIMARY"//)
+	#echo $NEW
 	mv "$i" "$NEW"
 done

 rm -f kernel-*-"$SECONDARY".config

 if [ "$DEBUGBUILDSENABLED" -eq 0 ]; then
-	for i in "${SPECPACKAGE_NAME}"-*debug*.config; do
+	for i in kernel-*debug*.config; do
 		base=$(echo "$i" | sed -r s/-?debug//g)
-		NEW=${SPECPACKAGE_NAME}-$(echo "$base" | cut -d - -f2-)
+		NEW=kernel-$(echo "$base" | cut -d - -f2-)
 		mv "$i" "$NEW"
 	done
 fi
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
--- a/kernel-aarch64-rt-64k-debug-fedora.config
+++ b/kernel-aarch64-rt-64k-debug-fedora.config
--- a/kernel-aarch64-rt-64k-debug-rhel.config
+++ b/kernel-aarch64-rt-64k-debug-rhel.config
--- a/kernel-aarch64-rt-64k-fedora.config
+++ b/kernel-aarch64-rt-64k-fedora.config
--- a/kernel-aarch64-rt-64k-rhel.config
+++ b/kernel-aarch64-rt-64k-rhel.config
--- a/kernel-aarch64-rt-debug-fedora.config
+++ b/kernel-aarch64-rt-debug-fedora.config
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
--- a/kernel-aarch64-rt-fedora.config
+++ b/kernel-aarch64-rt-fedora.config
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
--- a/kernel-riscv64-rt-debug-fedora.config
+++ b/kernel-riscv64-rt-debug-fedora.config
--- a/kernel-riscv64-rt-fedora.config
+++ b/kernel-riscv64-rt-fedora.config
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
--- a/kernel-riscv64-debug-rhel.config
+++ b/kernel-riscv64-debug-rhel.config
--- a/kernel-riscv64-rhel.config
+++ b/kernel-riscv64-rhel.config
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
--- a/kernel-x86_64-rt-debug-fedora.config
+++ b/kernel-x86_64-rt-debug-fedora.config
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
--- a/kernel-x86_64-rt-fedora.config
+++ b/kernel-x86_64-rt-fedora.config
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
--- a/kernel.changelog
+++ b/kernel.changelog
--- a/kernel.sbat.template
+++ b/kernel.sbat.template
@ -1,2 +0,0 @@
-sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com
--- a/kernel.spec
+++ b/kernel.spec
--- a/merge.pl
+++ b/merge.pl
@ -0,0 +1,72 @@
+#! /usr/bin/perl
+
+my @args=@ARGV;
+my %configvalues;
+my @configoptions;
+my $configcounter = 0;
+
+# optionally print out the architecture as the first line of our output
+my $arch = $args[2];
+if (defined $arch) {
+	print "# $arch\n";
+}
+
+# first, read the override file
+
+open (FILE,"$args[0]") || die "Could not open $args[0]";
+while (<FILE>) {
+	my $str = $_;
+	my $configname;
+
+	if (/\# ([\w]+) is not set/) {
+		$configname = $1;
+	} elsif (/^\#/) {
+		# fall through on comments like 'avoid CONFIG_FOO=y'
+		;
+	} elsif (/([\w]+)=/) {
+		$configname = $1;
+	}
+
+	if (defined($configname) && !exists($configvalues{$configname})) {
+		$configvalues{$configname} = $str;
+		$configoptions[$configcounter] = $configname;
+		$configcounter ++;
+	}
+};
+
+# now, read and output the entire configfile, except for the overridden
+# parts... for those the new value is printed.
+
+open (FILE2,"$args[1]") || die "Could not open $args[1]";
+while (<FILE2>) {
+	my $configname;
+
+	if (/\# ([\w]+) is not set/) {
+		$configname = $1;
+	} elsif (/^\#/) {
+		# fall through on comments like 'avoid CONFIG_FOO=y'
+		;
+	} elsif (/([\w]+)=/) {
+		$configname  = $1;
+	}
+
+	if (defined($configname) && exists($configvalues{$configname})) {
+		print "$configvalues{$configname}";
+		delete($configvalues{$configname});
+	} else {
+		print "$_";
+	}
+}
+
+# now print the new values from the overridden configfile
+my $counter = 0;
+
+while ($counter < $configcounter) {
+	my $configname = $configoptions[$counter];
+	if (exists($configvalues{$configname})) {
+		print "$configvalues{$configname}";
+	}
+	$counter++;
+}
+
+1;
--- a/merge.py
+++ b/merge.py
@ -1,88 +0,0 @@
-#!/usr/bin/python3
-# SPDX-License-Identifier: GPL-2.0
-# Author: Clark Williams <williams@redhat.com>
-# Copyright (C) 2022 Red Hat, Inc.
-#
-# merge.py - a direct replacement for merge.pl in the redhat/configs directory
-#
-# invocation:   python merge.py overrides baseconfig [arch]
-#
-# This script merges two kernel configuration files, an override file and a
-# base config file and writes the results to stdout.
-#
-# The script reads the overrides into a dictionary, then reads the baseconfig
-# file, looking for overrides and replacing any found, then printing the result
-# to stdout. Finally any remaining (new) configs in the override are appended to the
-# end of the output
-
-import sys
-import re
-import os.path
-
-def usage(msg):
-    '''print a usage message and exit'''
-    sys.stderr.write(msg + "\n")
-    sys.stderr.write("usage: merge.py overrides baseconfig [arch]\n")
-    sys.exit(1)
-
-isset = re.compile(r'^(CONFIG_\w+)=')
-notset = re.compile(r'^#\s+(CONFIG_\w+)\s+is not set')
-
-# search an input line for a config (set or notset) pattern
-# if we get a match return the config that is being changed
-def find_config(line):
-    '''find a configuration line in the input and return the config name'''
-    m = isset.match(line)
-    if (m is not None):
-        return m.group(1)
-
-    m = notset.match(line)
-    if (m is not None):
-        return m.group(1)
-
-    return None
-
-#########################################################
-
-if len(sys.argv) < 3:
-    usage("must have two input files")
-
-override_file = sys.argv[1]
-baseconfig_file = sys.argv[2]
-
-if not os.path.exists(override_file):
-    usage(f"overrides config file {override_file:s} does not exist!")
-
-if not os.path.exists(baseconfig_file):
-    usage(f"base configs file {baseconfig_file:s} does not exist")
-
-if len(sys.argv) == 4:
-    print(f"# {sys.argv[3]:s}")
-
-# read each line of the override file and store any configuration values
-# in the overrides dictionary, keyed by the configuration name.
-overrides = {}
-with open(override_file, "rt", encoding="utf-8") as f:
-    for line in [l.strip() for l in f.readlines()]:
-        c = find_config(line)
-        if c and c not in overrides:
-            overrides[c] = line
-
-# now read and print the base config, checking each line
-# that defines a config value and printing the override if
-# it exists
-with open(baseconfig_file, "rt", encoding="utf-8") as f:
-    for line in [ l.strip() for l in f.readlines() ]:
-        c = find_config(line)
-        if c and c in overrides:
-            print(overrides[c])
-            del overrides[c]
-        else:
-            print(line)
-
-# print out the remaining configs (new values)
-# from the overrides file
-for v in overrides.values():
-    print (v)
-
-sys.exit(0)
--- a/mod-denylist.sh
+++ b/mod-denylist.sh
@ -1,16 +1,18 @@
 #! /bin/bash
 # shellcheck disable=SC2164

-rpm_buildroot="$1"
-module_dir="$2"
-module_list="$3"
-
-blacklist_conf_files="$(mktemp)"
+RpmDir=$1
+ModDir=$2
+Dir="$1/$2"
+# Note the list filename must have the format mod-[PACKAGE].list, for example,
+# mod-internal.list or mod-extra.list.  The PACKAGE is used to create a
+# override directory for the modules.
+List=$3
+Dest="$4"

 blacklist()
 {
-	mkdir -p "$rpm_buildroot/etc/modprobe.d/"
-	cat > "$rpm_buildroot/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
+	cat > "$RpmDir/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
 	# This kernel module can be automatically loaded by non-root users. To
 	# enhance system security, the module is blacklisted by default to ensure
 	# system administrators make the module available for use as needed.
@ -19,12 +21,11 @@ blacklist()
 	# Remove the blacklist by adding a comment # at the start of the line.
 	blacklist $1
 __EOF__
-	echo "%config(noreplace) /etc/modprobe.d/$1-blacklist.conf" >> "$blacklist_conf_files"
 }

 check_blacklist()
 {
-	mod="$rpm_buildroot/$1"
+	mod=$(find "$RpmDir/$ModDir" -name "$1")
 	[ ! "$mod" ] && return 0
 	if modinfo "$mod" | grep -q '^alias:\s\+net-'; then
 		mod="${1##*/}"
@ -34,6 +35,28 @@ check_blacklist()
 	fi
 }

+find_depends()
+{
+	dep=$1
+	depends=$(modinfo "$dep" | sed -n -e "/^depends/ s/^depends:[ \t]*//p")
+	[ -z "$depends" ] && exit
+	for mod in ${depends//,/ }
+	do
+		match=$(grep "^$mod.ko" "$ListName")
+		[ -z "$match" ] && continue
+		# check if the module we are looking at is in mod-* too.
+		# if so we do not need to mark the dep as required.
+		mod2=${dep##*/}  # same as $(basename $dep), but faster
+		match2=$(grep "^$mod2" "$ListName")
+		if [ -n "$match2" ]
+		then
+			#echo $mod2 >> notreq.list
+			continue
+		fi
+		echo "$mod".ko >> req.list
+	done
+}
+
 foreachp()
 {
 	P=$(nproc)
@ -51,17 +74,91 @@ foreachp()
 	wait
 }

+# Destination was specified on the command line
+test -n "$4" && echo "$0: Override Destination $Dest has been specified."
+
+pushd "$Dir"
+
+OverrideDir=$(basename "$List")
+OverrideDir=${OverrideDir%.*}
+OverrideDir=${OverrideDir#*-}
+mkdir -p "$OverrideDir"
+
+rm -rf modnames
+find . -name "*.ko" -type f > modnames
+# Look through all of the modules, and throw any that have a dependency in
+# our list into the list as well.
+rm -rf dep.list dep2.list
+rm -rf req.list req2.list
+touch dep.list req.list
+cp "$List" .
+
+# This variable needs to be exported because it is used in sub-script
+# executed by xargs
+ListName=$(basename "$List")
+export ListName
+
+foreachp find_depends < modnames
+
+sort -u req.list > req2.list
+sort -u "$ListName" > modules2.list
+join -v 1 modules2.list req2.list > modules3.list
+
+while IFS= read -r mod
+do
+    # get the path for the module
+    modpath=$(grep /"$mod" modnames)
+    [ -z "$modpath" ] && continue
+    echo "$modpath" >> dep.list
+done < modules3.list
+
+sort -u dep.list > dep2.list
+
+if [ -n "$Dest" ]; then
+    # now move the modules into the $Dest directory
+    while IFS= read -r mod
+    do
+	newpath=$(dirname "$mod" | sed -e "s/kernel\\//$Dest\//")
+	mkdir -p "$newpath"
+	mv "$mod" "$newpath"
+	echo "$mod" | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> "$RpmDir"/"$ListName"
+    done < dep2.list
+fi
+
+popd
+
+# If we're signing modules, we can't leave the .mod files for the .ko files
+# we've moved in .tmp_versions/.  Remove them so the Kbuild 'modules_sign'
+# target doesn't try to sign a non-existent file.  This is kinda ugly, but
+# so are the modules-* packages.
+
+while IFS= read -r mod
+do
+  modfile=$(basename "$mod" | sed -e 's/.ko/.mod/')
+  rm .tmp_versions/"$modfile"
+done < "$Dir"/dep2.list
+
+if [ -z "$Dest" ]; then
+	sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
+	echo "./$RpmDir/$ListName created."
+	[ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/"
+	foreachp check_blacklist < "$List"
+fi
+
 # Many BIOS-es export a PNP-id which causes the floppy driver to autoload
 # even though most modern systems don't have a 3.5" floppy driver anymore
 # this replaces the old die_floppy_die.patch which removed the PNP-id from
 # the module

-floppylist=("$rpm_buildroot"/"$module_dir"/kernel/drivers/block/floppy.ko*)
+floppylist=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*)
 if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then
     blacklist "floppy"
 fi

-foreachp check_blacklist < "$module_list"
+# avoid an empty kernel-extra package
+echo "$ModDir/$OverrideDir" >> "$RpmDir/$ListName"

-cat "$blacklist_conf_files" >> "$module_list"
-rm -f "$blacklist_conf_files"
+pushd "$Dir"
+rm modnames dep.list dep2.list req.list req2.list
+rm "$ListName" modules2.list modules3.list
+popd
--- a/mod-extra.list.fedora
+++ b/mod-extra.list.fedora
@ -0,0 +1,195 @@
+6pack.ko
+a3d.ko
+act200l-sir.ko
+actisys-sir.ko
+adi.ko
+aer_inject.ko
+af_802154.ko
+affs.ko
+ali-ircc.ko
+analog.ko
+appletalk.ko
+atm.ko
+avma1_cs.ko
+avm_cs.ko
+avmfritz.ko
+ax25.ko
+b1.ko
+bas_gigaset.ko
+batman-adv.ko
+baycom_par.ko
+baycom_ser_fdx.ko
+baycom_ser_hdx.ko
+befs.ko
+bpqether.ko
+br2684.ko
+capi.ko
+c_can.ko
+c_can_platform.ko
+clip.ko
+cobra.ko
+coda.ko
+cuse.ko
+db9.ko
+dccp_diag.ko
+dccp_ipv4.ko
+dccp_ipv6.ko
+dccp.ko
+dccp_probe.ko
+diva_idi.ko
+divas.ko
+dlm.ko
+ds1wm.ko
+ds2482.ko
+ds2490.ko
+dss1_divert.ko
+elsa_cs.ko
+ems_pci.ko
+ems_usb.ko
+esd_usb2.ko
+esi-sir.ko
+floppy.ko
+gamecon.ko
+gf2k.ko
+gfs2.ko
+gigaset.ko
+girbil-sir.ko
+grip.ko
+grip_mp.ko
+guillemot.ko
+hdlcdrv.ko
+hfc4s8s_l1.ko
+hfcmulti.ko
+hfcpci.ko
+hisax.ko
+hwa-rc.ko
+hysdn.ko
+i2400m.ko
+i2400m-sdio.ko
+i2400m-usb.ko
+ieee802154.ko
+iforce.ko
+interact.ko
+ipddp.ko
+ipx.ko
+isdn.ko
+joydump.ko
+kingsun-sir.ko
+ks959-sir.ko
+ksdazzle-sir.ko
+kvaser_pci.ko
+l2tp_core.ko
+l2tp_debugfs.ko
+l2tp_eth.ko
+l2tp_ip.ko
+l2tp_netlink.ko
+l2tp_ppp.ko
+lec.ko
+ma600-sir.ko
+magellan.ko
+mcp2120-sir.ko
+mISDN_core.ko
+mISDN_dsp.ko
+mkiss.ko
+mptbase.ko
+mptctl.ko
+mptfc.ko
+nci.ko
+ncpfs.ko
+netjet.ko
+netrom.ko
+nfc.ko
+nilfs2.ko
+ocfs2_dlmfs.ko
+ocfs2_dlm.ko
+ocfs2.ko
+ocfs2_nodemanager.ko
+ocfs2_stackglue.ko
+ocfs2_stack_o2cb.ko
+ocfs2_stack_user.ko
+old_belkin-sir.ko
+orinoco_cs.ko
+orinoco.ko
+orinoco_nortel.ko
+orinoco_pci.ko
+orinoco_plx.ko
+orinoco_usb.ko
+pcspkr.ko
+plx_pci.ko
+pn_pep.ko
+pppoatm.ko
+rds.ko
+rds_rdma.ko
+rds_tcp.ko
+rose.ko
+sch_atm.ko
+sch_cbq.ko
+sch_choke.ko
+sch_drr.ko
+sch_dsmark.ko
+sch_etf.ko
+sch_gred.ko
+sch_mqprio.ko
+sch_multiq.ko
+sch_netem.ko
+sch_qfq.ko
+sch_red.ko
+sch_sfb.ko
+sch_teql.ko
+sctp.ko
+sctp_probe.ko
+sidewinder.ko
+sja1000.ko
+sja1000_platform.ko
+slcan.ko
+slip.ko
+softing_cs.ko
+softing.ko
+spaceball.ko
+spaceorb.ko
+stinger.ko
+sysv.ko
+tcp_bic.ko
+tcp_highspeed.ko
+tcp_htcp.ko
+tcp_hybla.ko
+tcp_illinois.ko
+tcp_lp.ko
+tcp_scalable.ko
+tcp_vegas.ko
+tcp_veno.ko
+tcp_westwood.ko
+tcp_yeah.ko
+tekram-sir.ko
+tmdc.ko
+toim3232-sir.ko
+trancevibrator.ko
+turbografx.ko
+twidjoy.ko
+ubifs.ko
+ufs.ko
+umc.ko
+usbip-core.ko
+usbip-host.ko
+uwb.ko
+vcan.ko
+vhci-hcd.ko
+w1_bq27000.ko
+w1_ds2408.ko
+w1_ds2423.ko
+w1_ds2431.ko
+w1_ds2433.ko
+w1_ds2760.ko
+w1_ds2780.ko
+w1_ds2781.ko
+w1_ds28e04.ko
+w1_smem.ko
+w1_therm.ko
+w6692.ko
+walkera0701.ko
+wanrouter.ko
+warrior.ko
+whci.ko
+wire.ko
+yam.ko
+zhenhua.ko
--- a/mod-extra.list.rhel
+++ b/mod-extra.list.rhel
@ -0,0 +1,192 @@
+6pack.ko
+a3d.ko
+act200l-sir.ko
+actisys-sir.ko
+adi.ko
+aer_inject.ko
+af_802154.ko
+affs.ko
+ali-ircc.ko
+analog.ko
+appletalk.ko
+atm.ko
+avma1_cs.ko
+avm_cs.ko
+avmfritz.ko
+ax25.ko
+b1.ko
+bas_gigaset.ko
+batman-adv.ko
+baycom_par.ko
+baycom_ser_fdx.ko
+baycom_ser_hdx.ko
+befs.ko
+bpqether.ko
+br2684.ko
+capi.ko
+c_can.ko
+c_can_platform.ko
+clip.ko
+cobra.ko
+coda.ko
+cuse.ko
+db9.ko
+dccp_diag.ko
+dccp_ipv4.ko
+dccp_ipv6.ko
+dccp.ko
+dccp_probe.ko
+diva_idi.ko
+divas.ko
+ds1wm.ko
+ds2482.ko
+ds2490.ko
+dss1_divert.ko
+elsa_cs.ko
+ems_pci.ko
+ems_usb.ko
+esd_usb2.ko
+esi-sir.ko
+gamecon.ko
+gf2k.ko
+gigaset.ko
+girbil-sir.ko
+grip.ko
+grip_mp.ko
+guillemot.ko
+hdlcdrv.ko
+hfc4s8s_l1.ko
+hfcmulti.ko
+hfcpci.ko
+hisax.ko
+hwa-rc.ko
+hysdn.ko
+i2400m.ko
+i2400m-sdio.ko
+i2400m-usb.ko
+ieee802154.ko
+iforce.ko
+interact.ko
+ipddp.ko
+ipx.ko
+isdn.ko
+joydump.ko
+kingsun-sir.ko
+ks959-sir.ko
+ksdazzle-sir.ko
+kvaser_pci.ko
+l2tp_core.ko
+l2tp_debugfs.ko
+l2tp_eth.ko
+l2tp_ip.ko
+l2tp_ip6.ko
+l2tp_netlink.ko
+l2tp_ppp.ko
+lec.ko
+ma600-sir.ko
+magellan.ko
+mcp2120-sir.ko
+mISDN_core.ko
+mISDN_dsp.ko
+mkiss.ko
+mptbase.ko
+mptctl.ko
+mptfc.ko
+nci.ko
+ncpfs.ko
+netjet.ko
+netrom.ko
+nfc.ko
+nilfs2.ko
+ocfs2_dlmfs.ko
+ocfs2_dlm.ko
+ocfs2.ko
+ocfs2_nodemanager.ko
+ocfs2_stackglue.ko
+ocfs2_stack_o2cb.ko
+ocfs2_stack_user.ko
+old_belkin-sir.ko
+orinoco_cs.ko
+orinoco.ko
+orinoco_nortel.ko
+orinoco_pci.ko
+orinoco_plx.ko
+orinoco_usb.ko
+plx_pci.ko
+pn_pep.ko
+pppoatm.ko
+rds.ko
+rds_rdma.ko
+rds_tcp.ko
+rose.ko
+sch_atm.ko
+sch_cbq.ko
+sch_choke.ko
+sch_drr.ko
+sch_dsmark.ko
+sch_gred.ko
+sch_mqprio.ko
+sch_multiq.ko
+sch_netem.ko
+sch_qfq.ko
+sch_red.ko
+sch_sfb.ko
+sch_teql.ko
+sctp.ko
+sctp_diag.ko
+sctp_probe.ko
+sidewinder.ko
+sja1000.ko
+sja1000_platform.ko
+slcan.ko
+slip.ko
+softing_cs.ko
+softing.ko
+spaceball.ko
+spaceorb.ko
+stinger.ko
+sysv.ko
+tcp_bic.ko
+tcp_highspeed.ko
+tcp_htcp.ko
+tcp_hybla.ko
+tcp_illinois.ko
+tcp_lp.ko
+tcp_scalable.ko
+tcp_vegas.ko
+tcp_veno.ko
+tcp_westwood.ko
+tcp_yeah.ko
+tekram-sir.ko
+tmdc.ko
+toim3232-sir.ko
+trancevibrator.ko
+turbografx.ko
+twidjoy.ko
+ubifs.ko
+ufs.ko
+umc.ko
+usbip-core.ko
+usbip-host.ko
+uwb.ko
+vcan.ko
+vhci-hcd.ko
+w1_bq27000.ko
+w1_ds2408.ko
+w1_ds2423.ko
+w1_ds2431.ko
+w1_ds2433.ko
+w1_ds2760.ko
+w1_ds2780.ko
+w1_ds2781.ko
+w1_ds28e04.ko
+w1_smem.ko
+w1_therm.ko
+w6692.ko
+walkera0701.ko
+wanrouter.ko
+warrior.ko
+whci.ko
+wire.ko
+yam.ko
+zhenhua.ko
--- a/mod-internal.list
+++ b/mod-internal.list
@ -0,0 +1,51 @@
+dmatest
+kunit
+kunit-test
+ext4-inode-test
+list-test
+sysctl-test
+mptcp_crypto_test
+mptcp_token_test
+bitfield_kunit
+cmdline_kunit
+property-entry-test
+qos-test
+resource_kunit
+soc-topology-test
+string-stream-test
+test_linear_ranges
+test_bits
+test_kasan
+time_test
+fat_test
+lib_test
+rational-test
+test_list_sort
+slub_kunit
+memcpy_kunit
+dev_addr_lists_test
+kfence_test
+test_hash
+locktorture
+mac80211_hwsim
+netdevsim
+pktgen
+rcutorture
+rocker
+scftorture
+test_klp_atomic_replace
+test_klp_callbacks_demo
+test_klp_callbacks_demo2
+test_klp_callbacks_busy
+test_klp_callbacks_mod
+test_klp_livepatch
+test_klp_shadow_vars
+test_klp_state
+test_klp_state2
+test_klp_state3
+torture
+refscale
+memcpy_kunit
+dev_addr_lists_test
+test_hash
+test_bpf
--- a/mod-sign.sh
+++ b/mod-sign.sh
@ -19,7 +19,7 @@ NPROC=$(nproc)
 [ -z "$NPROC" ] && NPROC=1

 # NB: this loop runs 2000+ iterations. Try to be fast.
-echo "$modules" | xargs -r -n16 -P "$NPROC" sh -c "
+echo "$modules" | xargs -r -n16 -P $NPROC sh -c "
 for mod; do
    ./scripts/sign-file sha256 $MODSECKEY $MODPUBKEY \$mod
    rm -f \$mod.sig \$mod.dig
--- a/nvidiagpuoot001.x509
+++ b/nvidiagpuoot001.x509
--- a/parallel_xz.sh
+++ b/parallel_xz.sh
@ -0,0 +1,26 @@
+#!/bin/sh
+# Reads filenames on stdin, xz-compresses each in place.
+# Not optimal for "compress relatively few, large files" scenario!
+
+# How many xz's to run in parallel:
+procgroup=""
+while test "$#" != 0; do
+	# Get it from -jNUM
+	N="${1#-j}"
+	if test "$N" = "$1"; then
+		# Not -j<something> - warn and ignore
+		echo "parallel_xz: warning: unrecognized argument: '$1'"
+	else
+		procgroup="$N"
+	fi
+	shift
+done
+
+# If told to use only one cpu:
+test "$procgroup" || exec xargs -r xz
+test "$procgroup" = 1 && exec xargs -r xz
+
+# xz has some startup cost. If files are really small,
+# this cost might be significant. To combat this,
+# process several files (in sequence) by each xz process via -n 16:
+exec xargs -r -n 16 -P "$procgroup" xz
--- a/partial-clang-debug-snip.config
+++ b/partial-clang-debug-snip.config
@ -1,4 +0,0 @@
-# clang
-# CONFIG_DRM_WERROR is not set
-CONFIG_KASAN_STACK=y
-# CONFIG_KMSAN is not set
--- a/partial-clang-snip.config
+++ b/partial-clang-snip.config
@ -1,4 +0,0 @@
-# clang
-# CONFIG_DRM_WERROR is not set
-# CONFIG_KASAN_STACK is not set
-# CONFIG_KMSAN is not set
--- a/partial-clang_lto-aarch64-debug-snip.config
+++ b/partial-clang_lto-aarch64-debug-snip.config
@ -1,6 +0,0 @@
-# clang_lto
-# CONFIG_AUTOFDO_CLANG is not set
-# CONFIG_DRM_WERROR is not set
-CONFIG_KASAN_STACK=y
-# CONFIG_KMSAN is not set
-# CONFIG_PROPELLER_CLANG is not set
--- a/partial-clang_lto-aarch64-snip.config
+++ b/partial-clang_lto-aarch64-snip.config
@ -1,6 +0,0 @@
-# clang_lto
-# CONFIG_DRM_WERROR is not set
-# CONFIG_KASAN_STACK is not set
-# CONFIG_KMSAN is not set
-CONFIG_LTO_CLANG_THIN=y
-# CONFIG_LTO_NONE is not set
--- a/partial-clang_lto-x86_64-debug-snip.config
+++ b/partial-clang_lto-x86_64-debug-snip.config
@ -1,6 +0,0 @@
-# clang_lto
-# CONFIG_AUTOFDO_CLANG is not set
-# CONFIG_DRM_WERROR is not set
-CONFIG_KASAN_STACK=y
-# CONFIG_KMSAN is not set
-# CONFIG_PROPELLER_CLANG is not set
--- a/partial-clang_lto-x86_64-snip.config
+++ b/partial-clang_lto-x86_64-snip.config
@ -1,8 +0,0 @@
-# clang_lto
-# CONFIG_AUTOFDO_CLANG is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_KASAN_STACK is not set
-# CONFIG_KMSAN is not set
-CONFIG_LTO_CLANG_THIN=y
-# CONFIG_LTO_NONE is not set
-# CONFIG_PROPELLER_CLANG is not set
--- a/partial-kgcov-debug-snip.config
+++ b/partial-kgcov-debug-snip.config
@ -1,6 +0,0 @@
-# kgcov
-CONFIG_GCOV_KERNEL=y
-CONFIG_GCOV_PROFILE_ALL=y
-# CONFIG_GCOV_PROFILE_FTRACE is not set
-CONFIG_GCOV_PROFILE_RDS=y
-CONFIG_GCOV_PROFILE_URING=y
--- a/partial-kgcov-snip.config
+++ b/partial-kgcov-snip.config
@ -2,5 +2,3 @@
 CONFIG_GCOV_KERNEL=y
 CONFIG_GCOV_PROFILE_ALL=y
 # CONFIG_GCOV_PROFILE_FTRACE is not set
-CONFIG_GCOV_PROFILE_RDS=y
-CONFIG_GCOV_PROFILE_URING=y
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
--- a/patch-6.19-redhat.patch
+++ b/patch-6.19-redhat.patch
--- a/process_configs.sh
+++ b/process_configs.sh
@ -1,24 +1,18 @@
 #!/bin/bash
 #
-# This script takes the merged config files and processes them through olddefconfig
-# and listnewconfig to ensure kernel configurations are valid and complete.
+# This script takes the merged config files and processes them through oldconfig
+# and listnewconfig
 #
 # Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands
 # shellcheck disable=SC2164

-# Exit if this is a test environment
-test -n "$RHTEST" && exit 0
-
-# Display usage information and available command line options
 usage()
 {
 	# alphabetical order please
 	echo "process_configs.sh [ options ] package_name kernel_version"
 	echo "     -a: report all errors, equivalent to [-c -n -w -i]"
 	echo "     -c: error on mismatched config options"
-	echo "     -i: ignore any errors, but print them"
-	echo "     -m: specify make options (e.g., -m CC=clang, -m LLVM=1)"
-	echo "     -M: commit mismatched configs to pending directory"
+	echo "     -i: continue on error"
 	echo "     -n: error on unset config options"
 	echo "     -t: test run, do not overwrite original config"
 	echo "     -w: error on misconfigured config options"
@ -37,9 +31,6 @@ die()
 	exit 1
 }

-# Determine the correct cross-compiler prefix based on compiler type
-# For clang builds, return the architecture directly
-# For GCC builds, use the dummy-tools directory
 get_cross_compile()
 {
 	arch=$1
@ -50,8 +41,7 @@ get_cross_compile()
 	fi
 }

-# Find the top-level kernel source directory
-# (identified by MAINTAINERS file and drivers directory)
+# stupid function to find top of tree to do kernel make configs
 switch_to_toplevel()
 {
 	path="$(pwd)"
@ -68,124 +58,11 @@ switch_to_toplevel()
 	echo "$path"
 }

-# Determine the correct config path based on architecture and variant
-# This function maps arch/variant combinations to the proper pending directory
-determine_config_path()
-{
-	local arch="$1"
-	local variant="$2"
-	local config_path=""
-
-	# Identify the variant - they have their own top-level directories
-	if [[ "$variant" == *"rt"* ]]; then
-		# RT variant - goes under rt/
-		if [[ "$variant" == *"debug"* ]]; then
-			config_path="rt/debug"
-		else
-			config_path="rt/generic"
-		fi
-	elif [[ "$variant" == *"automotive"* ]]; then
-		# Automotive variant - goes under automotive/
-		if [[ "$variant" == *"debug"* ]]; then
-			config_path="automotive/debug"
-		else
-			config_path="automotive/generic"
-		fi
-	else
-		# Stock kernel - goes under top-level debug or generic
-		if [[ "$variant" == *"debug"* ]]; then
-			config_path="debug"
-		else
-			config_path="generic"
-		fi
-	fi
-
-	# Add architecture-specific subdirectories
-	case "$arch" in
-		arm64)
-			config_path="$config_path/arm/aarch64"
-			;;
-		powerpc)
-			config_path="$config_path/powerpc"
-			;;
-		riscv)
-			config_path="$config_path/riscv/riscv64"
-			;;
-		s390)
-			if [[ "$variant" == *"zfcpdump"* ]]; then
-				config_path="$config_path/s390x/zfcpdump"
-			else
-				config_path="$config_path/s390x"
-			fi
-			;;
-		x86_64)
-			config_path="$config_path/x86"
-			;;
-		*)
-			# For unknown architectures, don't add arch subdirectory
-			;;
-	esac
-
-	echo "$config_path"
-}
-
-# Parse mismatched configs found during processing and create
-# individual CONFIG files in the pending directory for each
-parse_mismatched_configs()
-{
-	local tmpdir
-	local count=$1    # Counter for unique filenames
-	local arch=$2
-	local variant=$3
-
-	tmpdir=$(mktemp -d)
-
-	# Parse the mismatches file and create individual CONFIG files
-	tail -n +2 .mismatches"${count}" | while read -r LINE
-	do
-		if echo "$LINE" | grep -q "Found # .* is not set, after generation"; then
-			# Handle case where we found "# CONFIG_FOO is not set" after generation
-			config_name="${LINE#*Found # }"
-			config_name="${config_name% is not set, after generation*}"
-			if [ -n "$config_name" ]; then
-				echo "# Mismatch found in $arch $variant config" > "$tmpdir/$config_name"
-				echo "# $config_name is not set" >> "$tmpdir/$config_name"
-			fi
-		elif echo "$LINE" | grep -q "Found .* after generation"; then
-			# Handle case where we found "CONFIG_FOO=value" after generation
-			config_name="${LINE#*Found }"
-			config_name="${config_name% after generation*}"
-			config_name="${config_name%=*}"
-			config_value="${LINE#*Found }"
-			config_value="${config_value#*=}"
-			config_value="${config_value% after generation*}"
-			if [ -n "$config_name" ] && [ -n "$config_value" ]; then
-				echo "# Mismatch found in $arch $variant config" > "$tmpdir/$config_name"
-				echo "$config_name=$config_value" >> "$tmpdir/$config_name"
-			fi
-		fi
-	done
-
-	# Copy the CONFIG files to the pending directory
-	config_path=$(determine_config_path "$arch" "$variant")
-	mkdir -p "$SCRIPT_DIR/pending-$FLAVOR/$config_path/"
-	for f in "$tmpdir"/*; do
-		[[ -e "$f" ]] || break
-		cp "$f" "$SCRIPT_DIR/pending-$FLAVOR/$config_path/"
-	done
-
-	rm -rf "$tmpdir"
-}
-
-# Check for configuration mismatches between the original and generated configs
 checkoptions()
 {
-	cfg=$1      # Original config file
-	cfgtmp=$2   # Generated config file
-	count=$3    # Counter for unique filenames
-	variant=$4  # Config variant (e.g., debug, rt)
+	count=$3
+	variant=$4

-	# This awk script compares configuration files for mismatches
 	/usr/bin/awk '

 		/is not set/ {
@ -208,7 +85,7 @@ checkoptions()
 					 print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
 			}
 		}
-	' "$cfg" "$cfgtmp" > .mismatches"${count}"
+	' "$1" "$2" > .mismatches"${count}"

 	checkoptions_error=false
 	if test -s .mismatches"${count}"
@ -228,18 +105,11 @@ checkoptions()
 		! $checkoptions_error && return

 		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}"
-
-		# Add mismatched configs to the pending directory
-		if test -n "$COMMITMISMATCHES"; then
-			parse_mismatched_configs "$count" "$arch" "$variant"
-		fi
 	else
 		rm -f .mismatches"${count}"
 	fi
 }

-# Parse the output of 'make listnewconfig' and 'make helpnewconfig'
-# to create properly formatted configuration files for new configs
 parsenewconfigs()
 {
 	tmpdir=$(mktemp -d)
@ -276,26 +146,21 @@ parsenewconfigs()
        /usr/bin/awk -v BASE="$tmpdir" '
                BEGIN { inpatch=0;
 			outfile="none";
-                        symbol="none";
-                        commit=""; }
+                        symbol="none"; }
                /^Symbol: .*$/ {
                        split($0, a, " ");
                        symbol="CONFIG_"a[2];
                        outfile=BASE "/fake_"symbol
-                        print "# ~~~" >> outfile;
                }
                /-----/ {
 			if (inpatch == 0) {
 				inpatch = 1;
 			}
                        else {
-                                print "# ~~~" >> outfile;
                                if (symbol != "none") {
-                                    print "# Commit: "commit >> outfile
                                    system("cat " outfile " " BASE "/" symbol " > " BASE "/tmpf");
                                    system("mv " BASE "/tmpf " BASE "/" symbol);
                                    symbol="none"
-                                    commit=""
 				}
                                outfile="none"
 				inpatch = 0;
@ -306,15 +171,6 @@ parsenewconfigs()
                                print "# "$0 >> outfile;
                        }
                }
-                /^Defined at .*$/ {
-                        split($0, x, " ");
-                        filenum=x[3];
-                        split(filenum, x, ":");
-                        file=x[1]
-                        line=x[2]
-                        cmd="git blame -L " line "," line " " file " | cut -d \" \" -f1 | xargs git log --pretty=format:\"%C(auto)%h %C(cyan)('%s')\" -1"
-                        cmd | getline commit
-                }


        ' .helpnewconfig
@ -324,38 +180,18 @@ parsenewconfigs()
 	popd &> /dev/null
 	for f in "$tmpdir"/*; do
 		[[ -e "$f" ]] || break
-		cp "$f" "$SCRIPT_DIR/pending-$FLAVOR/generic/"
+		cp "$f" "$SCRIPT_DIR/pending$FLAVOR/generic/"
 	done

 	rm -rf "$tmpdir"
 }

-# Commit any mismatched configs that were saved to the pending directory
-commit_mismatched_configs()
-{
-	# assume we are in $source_tree/configs, need to get to top level
-	pushd "$(switch_to_toplevel)" &>/dev/null
-
-	# Check if there are any modified or untracked mismatched configs to commit
-	if git status --porcelain "$SCRIPT_DIR/pending-$FLAVOR/" | grep -q .; then
-		echo "Committing mismatched configuration files..."
-		git add "$SCRIPT_DIR/pending-$FLAVOR"
-		git commit -m "[redhat] AUTOMATIC: Mismatched $FLAVOR configs"
-		echo "Mismatched configs committed to pending-$FLAVOR directory"
-	else
-		echo "No mismatched configs found to commit"
-	fi
-
-	popd &>/dev/null
-}
-
-# Processes all config files, finds new/unset configs, and commits them
 function commit_new_configs()
 {
 	# assume we are in $source_tree/configs, need to get to top level
 	pushd "$(switch_to_toplevel)" &>/dev/null

-	for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
 	do
 		arch=$(head -1 "$cfg" | cut -b 3-)
 		cfgtmp="${cfg}.tmp"
@ -382,13 +218,10 @@ function commit_new_configs()
 		echo "done"
 	done

-	# Commit the new configuration files to git
-	git add "$SCRIPT_DIR/pending-$FLAVOR"
-	# DO NOT CHANGE THIS MESSAGE! gen_config_patches.sh looks for this commit message.
+	git add "$SCRIPT_DIR/pending$FLAVOR"
 	git commit -m "[redhat] AUTOMATIC: New configs"
 }

-# Process a single configuration file
 function process_config()
 {
 	local cfg
@ -427,13 +260,14 @@ function process_config()
 		rm .newoptions"${count}"
 		RETURNCODE=1
 	fi
-	rm -f .newoptions"${count}"
+	rm .newoptions"${count}"

 	grep -E 'config.*warning' .listnewconfig"${count}" > .warnings"${count}"
 	if test -n "$CHECKWARNINGS" && test -s .warnings"${count}"
 	then
 		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
 		cat .warnings"${count}" >> .errors"${count}"
+		rm .warnings"${count}"
 	fi
 	rm .warnings"${count}"

@ -458,29 +292,30 @@ function process_config()
 	echo "Processing $cfg complete"
 }

-# Process all configuration files
-# Handles parallel processing and error reporting
 function process_configs()
 {
 	# assume we are in $source_tree/configs, need to get to top level
 	pushd "$(switch_to_toplevel)" &>/dev/null

+	# The next line is throwaway code for transition to parallel
+	# processing.  Leaving this line in place is harmless, but it can be
+	# removed the next time anyone updates this function.
+	[ -f .mismatches ] && rm -f .mismatches
+
 	count=0
-	for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
 	do
 		if [ "$count" -eq 0 ]; then
 			# do the first one by itself so that tools are built
 			process_config "$cfg" "$count"
 		fi
 		process_config "$cfg" "$count" &
-		# shellcheck disable=SC2004
 		waitpids[${count}]=$!
 		((count++))
 		while [ "$(jobs | grep -c Running)" -ge "$RHJOBS" ]; do :; done
 	done
-	# shellcheck disable=SC2048
 	for pid in ${waitpids[*]}; do
-		wait "${pid}"
+		wait ${pid}
 	done

 	rm "$SCRIPT_DIR"/*.config*.old
@ -490,13 +325,7 @@ function process_configs()
 		cat .errors*
 		rm .errors* -f
 	fi
-
-	# Commit any mismatched configs found during processing
-	if [ $RETURNCODE -eq 0 ] && test -n "$COMMITMISMATCHES"; then
-		rm .mismatches* -f
-		commit_mismatched_configs
-	# Otherwise, display any mismatched configs
-	elif ls .mismatches* 1> /dev/null 2>&1; then
+	if ls .mismatches* 1> /dev/null 2>&1; then
 		RETURNCODE=1
 		cat .mismatches*
 		rm .mismatches* -f
@ -508,13 +337,11 @@ function process_configs()
 }

 CHECKOPTIONS=""
-IGNOREERRORS=""
 NEWOPTIONS=""
 TESTRUN=""
 CHECKWARNINGS=""
 MAKEOPTS=""
 CC_IS_CLANG=0
-COMMITMISMATCHES=""

 RETURNCODE=0

@ -523,9 +350,7 @@ do
 	key="$1"
 	case $key in
 		-a)
-			# Enable all error checking options
 			CHECKOPTIONS="x"
-			IGNOREERRORS="x"
 			NEWOPTIONS="x"
 			CHECKWARNINGS="x"
 			;;
@ -535,9 +360,6 @@ do
 		-h)
 			usage
 			;;
-		-i)
-			IGNOREERRORS="x"
-			;;
 		-n)
 			NEWOPTIONS="x"
 			;;
@ -552,28 +374,32 @@ do
 			;;
 		-m)
 			shift
-			# Handle clang compiler options
 			if [ "$1" = "CC=clang" ] || [ "$1" = "LLVM=1" ]; then
 				CC_IS_CLANG=1
 			fi
 			MAKEOPTS="$MAKEOPTS $1"
 			;;
-		-M)
-			COMMITMISMATCHES="x"
-			CHECKOPTIONS="x"
-			;;
 		*)
 			break;;
 	esac
 	shift
 done

-KVERREL="$(test -n "$1" && echo "-$1" || echo "")"
-FLAVOR="$(test -n "$2" && echo "$2" || echo "rhel")"
+PACKAGE_NAME="${1:-kernel}" # defines the package name used
+KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
+SUBARCH="$(test -n "$3" && echo "-$3" || echo "")"
+FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")"
 # shellcheck disable=SC2015
+RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)"
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")

+# Config options for RHEL should target the pending-ark directory, not pending-common.
+if [ "$FLAVOR" = "-rhel" ]
+then
+	FLAVOR="-ark"
+fi
+
 # to handle this script being a symlink
 cd "$SCRIPT_DIR"

@ -583,8 +409,4 @@ else
 	process_configs
 fi

-if test -n "$IGNOREERRORS"; then
-	exit 0
-else
-	exit $RETURNCODE
-fi
+exit $RETURNCODE
--- a/redhatsecureboot301.cer
+++ b/redhatsecureboot301.cer
--- a/redhatsecurebootca1.cer
+++ b/redhatsecurebootca1.cer
--- a/rhelima.x509
+++ b/rhelima.x509
--- a/rhelima_centos.x509
+++ b/rhelima_centos.x509
--- a/rhelimaca1.x509
+++ b/rhelimaca1.x509
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -15,34 +15,7 @@ emptyrpm:
        - kernel-debug
        - kernel-debug-devel-matched
        - kernel-devel-matched
-        - kernel-modules-extra-matched
+        - kernel-lpae
        - kernel-zfcpdump
        - kernel-zfcpdump-devel-matched
        - kernel-zfcpdump-modules
-        - kernel-zfcpdump-modules-partner
-        - kernel-rt
-        - kernel-rt-debug
-        - kernel-rt-debug-devel-matched
-        - kernel-rt-devel-matched
-        - kernel-rt-modules-extra-matched
-        - kernel-64k
-        - kernel-64k-debug
-        - kernel-64k-debug-devel-matched
-        - kernel-64k-devel-matched
-        - kernel-64k-modules-extra-matched
-        - kernel-rt-64k
-        - kernel-rt-64k-debug
-        - kernel-rt-64k-debug-devel-matched
-        - kernel-rt-64k-devel-matched
-        - kernel-rt-64k-modules-extra-matched
-
-patches:
-    ignore_list:
-        - linux-kernel-test.patch
-        - patch-6.19-redhat.patch
-
-runpath:
-    ignore:
-        - /usr/libexec/kselftests/bpf/urandom_read
-        - /usr/libexec/kselftests/bpf/no_alu32/urandom_read
-        - /usr/libexec/kselftests/bpf/cpuv4/urandom_read
--- a/secureboot_ppc.cer
+++ b/secureboot_ppc.cer
--- a/secureboot_s390.cer
+++ b/secureboot_s390.cer
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.19-rc5.tar.xz) = d61ec1e68ee22b58a0e335e8a349e8c8a3d59219264d6f769d36c50f9a013e4bdf8b39481aa6dee575df62e60841ba687fccb7a82f99b9b005a09008927cb57e
-SHA512 (kernel-abi-stablelists-6.19.0.tar.xz) = 467b85c3bb413e713a2e1500060fe4f4ba6934cc5a28294a5952e4452baecf997e246317b09a34f7bece1daf26a4d4f40a95557ac843ec30d218c854f576516b
-SHA512 (kernel-kabi-dw-6.19.0.tar.xz) = 7a698cf2b133314dcbe1452a16859aa0af35d486af939b6c72b6d3e88692718900c61b79e31052342075fb74ee61581f19a5f8f1bac3e1813737f6336b84efe4
+SHA512 (linux-5.17.12.tar.xz) = bdf54320810a1ed1b303b89730aec2fa0e68e45b96c813a15f5cca60e6ce765c0b1a3d4fd39317765227429f206172c709df17741138c6b3e7cbc73ca98cb61d
+SHA512 (kernel-abi-stablelists-5.17.12-100.tar.bz2) = 96ae8c40d8cb8d8f78c5b1dfc74d3fcb76b4ca3d2fbb1e147af0d4f0d2f41ad312cb81d475f806b24bc9dcf1e61ff968192a8c8f2aed12c4001efe551983d259
+SHA512 (kernel-kabi-dw-5.17.12-100.tar.bz2) = 92d19a7604057d7c6997250dd0313b8a8d0b1d664dc99d022e4e8230d84cd1157ef954ff3cea4e9c3f98c2ab54126b48b12d6a92c36d6188223366ef431b55f0
--- a/uki-addons.sbat.template
+++ b/uki-addons.sbat.template
@ -1,2 +0,0 @@
-sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-kernel-uki-virt-addons.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt-addons,@KVER,mailto:secalert@redhat.com
--- a/uki.sbat.template
+++ b/uki.sbat.template
@ -1,2 +0,0 @@
-sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-kernel-uki-virt.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt,@KVER,mailto:secalert@redhat.com
--- a/uki_addons.json
+++ b/uki_addons.json
@ -1,48 +0,0 @@
-{
-    "common": {
-        "crashkernel-1536M.addon": [
-            "crashkernel=1536M\n"
-        ],
-        "crashkernel-192M.addon": [
-            "crashkernel=192M\n"
-        ],
-        "crashkernel-1G.addon": [
-            "crashkernel=1G\n"
-        ],
-        "crashkernel-256M.addon": [
-            "crashkernel=256M\n"
-        ],
-        "crashkernel-2G.addon": [
-            "crashkernel=2G\n"
-        ],
-        "crashkernel-512M.addon": [
-            "crashkernel=512M\n"
-        ],
-        "crashkernel-default.addon": [
-            "crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M\n"
-        ],
-        "debug.addon": [
-            "debug"
-        ],
-        "systemd-volatile-overlay.addon": [
-            "systemd.volatile=overlay"
-        ]
-    },
-    "virt": {
-        "common": {
-            "fips-disable.addon": [
-                "fips=0\n"
-            ],
-            "fips-enable.addon": [
-                "fips=1\n"
-            ]
-        },
-        "rhel": {
-            "aarch64": {
-                "crashkernel-default.addon": [
-                    "crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M\n"
-                ]
-            }
-        }
-    }
-}
--- a/Show more
+++ b/Show more