kernel-6.11.9-100

* Sun Nov 17 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.11.9-0] - Linux v6.11.9 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
kernel-6.11.8-100
2024-11-17 11:17:19 -07:00 · 2024-11-14 16:52:35 -03:00 · 2024-11-08 15:38:58 -03:00 · 2024-11-01 12:26:29 -03:00 · 2024-10-22 15:28:53 -03:00 · 2024-10-20 08:22:12 -06:00
80 changed files with 40464 additions and 9537 deletions
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 57
+RHEL_RELEASE = 0

 #
 # RHEL_REBASE_NUM
--- a/Module.kabi_dup_riscv64
+++ b/Module.kabi_dup_riscv64
--- a/Module.kabi_riscv64
+++ b/Module.kabi_riscv64
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,342 +1,150 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/31a8a6b4003446a250fa9f7ee97de71720331c1f
- 31a8a6b4003446a250fa9f7ee97de71720331c1f [redhat] kernel/rh_messages.c: move hardware tables to rh_messages.h
+https://gitlab.com/cki-project/kernel-ark/-/commit/41149211717aeda4414e41a5eddee11b605f3a85
+ 41149211717aeda4414e41a5eddee11b605f3a85 Revert "cpupower: Bump soname version"

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/0f6fbe653a0a7943a1c36ee4f47395ea30b79c75
- 0f6fbe653a0a7943a1c36ee4f47395ea30b79c75 [redhat] kernel/rh_messages.c: Wire up new calls
+https://gitlab.com/cki-project/kernel-ark/-/commit/5726a406fa039a9c1cf831953428f87caff38745
+ 5726a406fa039a9c1cf831953428f87caff38745 Bluetooth: btusb: Fix not being able to reconnect after suspend

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b73e031eb85ee3e0755203421a1b6ad153216568
- b73e031eb85ee3e0755203421a1b6ad153216568 [redhat] drivers/pci: Update rh_messages.c
+https://gitlab.com/cki-project/kernel-ark/-/commit/b4af2ea6127c979d151fe78817cb86e999d0323b
+ b4af2ea6127c979d151fe78817cb86e999d0323b Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/edb8831394cd8eddf069a09842f464bfc8a957a7
- edb8831394cd8eddf069a09842f464bfc8a957a7 [redhat] drivers/message/fusion/mptspi.c: Remove extra disabled warning
+https://gitlab.com/cki-project/kernel-ark/-/commit/b630c41705d79da0dfb19aa07a8985ba6fb61a02
+ b630c41705d79da0dfb19aa07a8985ba6fb61a02 HID: amd_sfh: Switch to device-managed dmam_alloc_coherent()

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/635b364c987e7559bc20d3f22822a514b56ac33d
- 635b364c987e7559bc20d3f22822a514b56ac33d [redhat] mptsas: Remove add_taint()
+https://gitlab.com/cki-project/kernel-ark/-/commit/15cf18f2e233b61e3a7514c214baa47b49c7e2bc
+ 15cf18f2e233b61e3a7514c214baa47b49c7e2bc wifi: rtw89: pci: early chips only enable 36-bit DMA on specific PCI hosts

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b8cb66e488122646b260a080f683d8746a145ebb
- b8cb66e488122646b260a080f683d8746a145ebb [redhat] drivers/pci: Remove RHEL-only pci_hw_*() functions
+https://gitlab.com/cki-project/kernel-ark/-/commit/a9eac0825b8509eb9a98121c6e1bfca711d4a3fe
+ a9eac0825b8509eb9a98121c6e1bfca711d4a3fe HID: lenovo: Add support for Thinkpad X1 Tablet Gen 3 keyboard

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/7ba2fc7e001181fe630e92a4633e76a6c71689e1
- 7ba2fc7e001181fe630e92a4633e76a6c71689e1 scsi: sd: Add "probe_type" module parameter to allow synchronous probing
+https://gitlab.com/cki-project/kernel-ark/-/commit/37f88e3ca1bde6c898222d6dbd8f4d804c2e9834
+ 37f88e3ca1bde6c898222d6dbd8f4d804c2e9834 media: qcom: camss: Fix ordering of pm_runtime_enable

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4b35b89927d7bc634917f603ffc1bcccbdca2f15
- 4b35b89927d7bc634917f603ffc1bcccbdca2f15 Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"
+https://gitlab.com/cki-project/kernel-ark/-/commit/9f2335d9e326af21c4376eec9bece213a512e726
+ 9f2335d9e326af21c4376eec9bece213a512e726 media: qcom: camss: Remove use_count guard in stop_streaming

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8407896256bc918ea5b5939c17ea6811cfeb5167
- 8407896256bc918ea5b5939c17ea6811cfeb5167 kernel/rh_messages.c: Another gcc12 warning on redundant NULL test
+https://gitlab.com/cki-project/kernel-ark/-/commit/7e88a0ffc13ab94b37a3d45e1180bf98d5a1ab75
+ 7e88a0ffc13ab94b37a3d45e1180bf98d5a1ab75 arm64: dts: allwinner: a64: Add GPU thermal trips to the SoC dtsi

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/04d05161b6352e1c737773ee8fcf60e8dc5d986f
- 04d05161b6352e1c737773ee8fcf60e8dc5d986f tools/resolve_btfids: Fix setting HOSTCFLAGS
+https://gitlab.com/cki-project/kernel-ark/-/commit/5b1fd9a9d2bd49e45e3703121c69142a78f75acb
+ 5b1fd9a9d2bd49e45e3703121c69142a78f75acb arm64: dts: rockchip: Raise Pinebook Pro's panel backlight PWM frequency

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/1663312eaf10607c242839f0b8f9eee4811bbce6
- 1663312eaf10607c242839f0b8f9eee4811bbce6 Enable IO_URING for RHEL
+https://gitlab.com/cki-project/kernel-ark/-/commit/1702e478b95131f3004b3c2eb2afd9eb88c69972
+ 1702e478b95131f3004b3c2eb2afd9eb88c69972 arm64: dts: qcom: sc8280xp-x13s: Enable RGB sensor

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d4b1f4ec1652e665cda93c328a5cb5f093e7b5c7
- d4b1f4ec1652e665cda93c328a5cb5f093e7b5c7 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64
+https://gitlab.com/cki-project/kernel-ark/-/commit/eac4ee8c9ca0b44bc1611e735a08a940792f5ef0
+ eac4ee8c9ca0b44bc1611e735a08a940792f5ef0 ARM: dts: bcm2837/bcm2712: adjust local intc node names

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/2d41330cffed266cd022a54aeb939bde44114553
- 2d41330cffed266cd022a54aeb939bde44114553 redhat: version two of Makefile.rhelver tweaks
+https://gitlab.com/cki-project/kernel-ark/-/commit/68ca5d3e34a03dffe1ff51bf8a585923d7c985e5
+ 68ca5d3e34a03dffe1ff51bf8a585923d7c985e5 arm64: dts: broadcom: Add minimal support for Raspberry Pi 5

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4c7e9384d60e4a3420ebba59ec2ce581a2c21922
- 4c7e9384d60e4a3420ebba59ec2ce581a2c21922 redhat:  adapt to upstream Makefile change
+https://gitlab.com/cki-project/kernel-ark/-/commit/9d4f912ea7ae72beae0943fb93468c93c08d53fd
+ 9d4f912ea7ae72beae0943fb93468c93c08d53fd redhat: include resolve_btfids in kernel-devel

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/568b6269c7031df089eda843672c943c21d2b4b0
- 568b6269c7031df089eda843672c943c21d2b4b0 kernel/rh_messages.c: gcc12 warning on redundant NULL test
+https://gitlab.com/cki-project/kernel-ark/-/commit/9b332458aa4b5d43c795b8c03e1041956d92e09b
+ 9b332458aa4b5d43c795b8c03e1041956d92e09b redhat: workaround CKI cross compilation for scripts

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8842155d14300cf2fa218f6ffc0f4309c389ae98
- 8842155d14300cf2fa218f6ffc0f4309c389ae98 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
+https://gitlab.com/cki-project/kernel-ark/-/commit/1bd2b8b9cdd378bc0bcc46ffb3580b810b22bec5
+ 1bd2b8b9cdd378bc0bcc46ffb3580b810b22bec5 crypto: akcipher - Disable signing and decryption

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8395c4a5d3fedb33e41240f545e8b0170a4795e2
- 8395c4a5d3fedb33e41240f545e8b0170a4795e2 ARK: Remove code marking drivers as tech preview
+https://gitlab.com/cki-project/kernel-ark/-/commit/35655c383bfd88c12f760899ea64659da5a29627
+ 35655c383bfd88c12f760899ea64659da5a29627 crypto: dh - implement FIPS PCT

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/49a42f776d62622212d399b6167cd7024a93d135
- 49a42f776d62622212d399b6167cd7024a93d135 ARK: Remove code marking devices deprecated
+https://gitlab.com/cki-project/kernel-ark/-/commit/dc99bf18097cb54436cdea0c68844819d2adfe75
+ dc99bf18097cb54436cdea0c68844819d2adfe75 crypto: ecdh - disallow plain "ecdh" usage in FIPS mode

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/27f6010ebf0e2b435f48b8c05169455d164db67f
- 27f6010ebf0e2b435f48b8c05169455d164db67f ARK: Remove code marking devices unmaintained
+https://gitlab.com/cki-project/kernel-ark/-/commit/d684af303ca6e652bcb52c6637f1c49a65f59100
+ d684af303ca6e652bcb52c6637f1c49a65f59100 crypto: seqiv - flag instantiations as FIPS compliant

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/bdaaa2555faea1a9d1d16c6772492aaba50f8a06
- bdaaa2555faea1a9d1d16c6772492aaba50f8a06 rh_message: Fix function name
+https://gitlab.com/cki-project/kernel-ark/-/commit/7c0d780c693acc53b94b27e5a9c72d377b98aab4
+ 7c0d780c693acc53b94b27e5a9c72d377b98aab4 not upstream: drop openssl ENGINE API usage

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/ba400c93751b365aa0c2f409167705f3eb0f83ed
- ba400c93751b365aa0c2f409167705f3eb0f83ed Add Partner Supported taint flag to kAFS
+https://gitlab.com/cki-project/kernel-ark/-/commit/f8e0850f38863ef52f2cd55fdcdb3abaaad9e73e
+ f8e0850f38863ef52f2cd55fdcdb3abaaad9e73e lsm: update security_lock_kernel_down

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a6fefea2aa20540f75f347ca634421a863482497
- a6fefea2aa20540f75f347ca634421a863482497 Add Partner Supported taint flag
+https://gitlab.com/cki-project/kernel-ark/-/commit/32ab33b828ef7b77647c69cf192ca42d9f6566e9
+ 32ab33b828ef7b77647c69cf192ca42d9f6566e9 scsi: sd: Add "probe_type" module parameter to allow synchronous probing

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/fc7eb9f64c6045692ac77041b8141687857ef0c9
- fc7eb9f64c6045692ac77041b8141687857ef0c9 [redhat] virtio: enable virtio-mem on x86-64 as tech-preview
+https://gitlab.com/cki-project/kernel-ark/-/commit/060bc66dee0bd947f7a19240d1059128c39a555b
+ 060bc66dee0bd947f7a19240d1059128c39a555b Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a9af9dbe4435ecb20d5bee491694f32bc1a38e59
- a9af9dbe4435ecb20d5bee491694f32bc1a38e59 kabi: Add kABI macros for enum type
+https://gitlab.com/cki-project/kernel-ark/-/commit/87bee3c15d593cdf1f4c337d65900cc8639459e2
+ 87bee3c15d593cdf1f4c337d65900cc8639459e2 Enable IO_URING for RHEL

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/032e204a00c43a65ed255402f26ac6ba35e4a934
- 032e204a00c43a65ed255402f26ac6ba35e4a934 kabi: expand and clarify documentation of aux structs
+https://gitlab.com/cki-project/kernel-ark/-/commit/c1791b7d3183881333af9a8fec60565ac55cad61
+ c1791b7d3183881333af9a8fec60565ac55cad61 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/769af6e3007741499ab542d64015a09473919013
- 769af6e3007741499ab542d64015a09473919013 kabi: introduce RH_KABI_USE_AUX_PTR
+https://gitlab.com/cki-project/kernel-ark/-/commit/ad94095fbf83123eeb07fdbf38af75b0f5344f27
+ ad94095fbf83123eeb07fdbf38af75b0f5344f27 redhat: version two of Makefile.rhelver tweaks

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/1e46859c5c4aeae2436c907b1a505e276012da84
- 1e46859c5c4aeae2436c907b1a505e276012da84 kabi: rename RH_KABI_SIZE_AND_EXTEND to AUX
+https://gitlab.com/cki-project/kernel-ark/-/commit/baf728d501a2661e474ebbae11d667849e17d29b
+ baf728d501a2661e474ebbae11d667849e17d29b redhat:  adapt to upstream Makefile change

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4bcdda9c7ac43c1e32fd9100a33629d77bcfb728
- 4bcdda9c7ac43c1e32fd9100a33629d77bcfb728 kabi: more consistent _RH_KABI_SIZE_AND_EXTEND
+https://gitlab.com/cki-project/kernel-ark/-/commit/472b92a5d9724cbbd0607fd5d82947764c2b972f
+ 472b92a5d9724cbbd0607fd5d82947764c2b972f Change acpi_bus_get_acpi_device to acpi_get_acpi_dev

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/cb6e8583cfa6ebc2de08816d075e2fd95582fe87
- cb6e8583cfa6ebc2de08816d075e2fd95582fe87 kabi: use fixed field name for extended part
+https://gitlab.com/cki-project/kernel-ark/-/commit/d75c410357fb64130d57d556ff9229139c14a8e8
+ d75c410357fb64130d57d556ff9229139c14a8e8 RHEL: disable io_uring support

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/02ec928de37ba45e56233f92d16d83e5bede18cd
- 02ec928de37ba45e56233f92d16d83e5bede18cd kabi: fix dereference in RH_KABI_CHECK_EXT
+https://gitlab.com/cki-project/kernel-ark/-/commit/6e698e13917736eccc5bb20af0bc67490d8528cf
+ 6e698e13917736eccc5bb20af0bc67490d8528cf REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/1e238f8a7ebd3e5f52b8192e25d09771c41e3ff6
- 1e238f8a7ebd3e5f52b8192e25d09771c41e3ff6 kabi: fix RH_KABI_SET_SIZE macro
+https://gitlab.com/cki-project/kernel-ark/-/commit/85626adff3f11ecbdb88472ddbd9ce884ef9e114
+ 85626adff3f11ecbdb88472ddbd9ce884ef9e114 KEYS: Make use of platform keyring for module signature verify

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f31ce4394db2726a6094b09dc1524bc74abce88b
- f31ce4394db2726a6094b09dc1524bc74abce88b kabi: expand and clarify documentation
+https://gitlab.com/cki-project/kernel-ark/-/commit/ee87b152d9cb9f421259db9bfc8e3904c8d7305f
+ ee87b152d9cb9f421259db9bfc8e3904c8d7305f Input: rmi4 - remove the need for artificial IRQ in case of HID

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6296da12a9e76f40cf84ec9cbb5a03102ada52e6
- 6296da12a9e76f40cf84ec9cbb5a03102ada52e6 kabi: make RH_KABI_USE replace any number of reserved fields
+https://gitlab.com/cki-project/kernel-ark/-/commit/1ed5225c5a34662ad010075699d8790f5b7171dc
+ 1ed5225c5a34662ad010075699d8790f5b7171dc ARM: tegra: usb no reset

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/7b2c1c83cc7ba0594d30131982ca7a499a89e347
- 7b2c1c83cc7ba0594d30131982ca7a499a89e347 kabi: rename RH_KABI_USE2 to RH_KABI_USE_SPLIT
+https://gitlab.com/cki-project/kernel-ark/-/commit/b0ed5d1de8bc342f1620f00d8378a8c7b3f41e26
+ b0ed5d1de8bc342f1620f00d8378a8c7b3f41e26 s390: Lock down the kernel when the IPL secure flag is set

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c32c50b01798ba010f7b1995f1dac4d859390f63
- c32c50b01798ba010f7b1995f1dac4d859390f63 kabi: change RH_KABI_REPLACE2 to RH_KABI_REPLACE_SPLIT
+https://gitlab.com/cki-project/kernel-ark/-/commit/a2c6c57e2d1d60148bc3e623dbc046aef65eacdb
+ a2c6c57e2d1d60148bc3e623dbc046aef65eacdb efi: Lock down the kernel if booted in secure boot mode

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c20d976d87fa1799c0649ef66304a8acd396a59b
- c20d976d87fa1799c0649ef66304a8acd396a59b kabi: change RH_KABI_REPLACE_UNSAFE to RH_KABI_BROKEN_REPLACE
+https://gitlab.com/cki-project/kernel-ark/-/commit/c9a7afaa703bfd5c439fcada879031982e1f31a5
+ c9a7afaa703bfd5c439fcada879031982e1f31a5 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f66ba367748ba016ac7209625da7313b072fbc36
- f66ba367748ba016ac7209625da7313b072fbc36 kabi: introduce RH_KABI_ADD_MODIFIER
+https://gitlab.com/cki-project/kernel-ark/-/commit/044abfe144b8f9413327cb5f6de53fa65bee13fa
+ 044abfe144b8f9413327cb5f6de53fa65bee13fa security: lockdown: expose a hook to lock the kernel down

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/84c7438ff031a3c111d12699794dcb80940599d8
- 84c7438ff031a3c111d12699794dcb80940599d8 kabi: Include kconfig.h
+https://gitlab.com/cki-project/kernel-ark/-/commit/df4dc5c5082636ea3dd0096eae3e113c3b3903d7
+ df4dc5c5082636ea3dd0096eae3e113c3b3903d7 Make get_cert_list() use efi_status_to_str() to print error messages.

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c552c2fc68091b1b6a3c0b7e390086d1ef2e2387
- c552c2fc68091b1b6a3c0b7e390086d1ef2e2387 kabi: macros for intentional kABI breakage
+https://gitlab.com/cki-project/kernel-ark/-/commit/8378c41fcd8c0fadf4d4e3d046870c570855dd5f
+ 8378c41fcd8c0fadf4d4e3d046870c570855dd5f Add efi_status_to_str() and rework efi_status_to_err().

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/07d9f75e2d8b4017788125eb40b7ac6a616853fe
- 07d9f75e2d8b4017788125eb40b7ac6a616853fe kabi: fix the note about terminating semicolon
+https://gitlab.com/cki-project/kernel-ark/-/commit/1d98b5d2ef6e9b3bcb2e71e0b89a7777d28b87cb
+ 1d98b5d2ef6e9b3bcb2e71e0b89a7777d28b87cb arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4cb3c2d552c8da9719b60c07b5ba060aca60441b
- 4cb3c2d552c8da9719b60c07b5ba060aca60441b kabi: introduce RH_KABI_HIDE_INCLUDE and RH_KABI_FAKE_INCLUDE
+https://gitlab.com/cki-project/kernel-ark/-/commit/0f01dc56b6690c204e534efead7f833a151668e4
+ 0f01dc56b6690c204e534efead7f833a151668e4 iommu/arm-smmu: workaround DMA mode issues

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b8738cef72eab0d627e0ecf5d003bb5edb707c3a
- b8738cef72eab0d627e0ecf5d003bb5edb707c3a pci.h: Fix static include
+https://gitlab.com/cki-project/kernel-ark/-/commit/f4aceb8131752369713f8eedb949c72a6ff6f65b
+ f4aceb8131752369713f8eedb949c72a6ff6f65b ipmi: do not configure ipmi for HPE m400

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/147385367a23d0fdd9002438ab84099807c7f410
- 147385367a23d0fdd9002438ab84099807c7f410 drivers/pci/pci-driver.c: Fix if/ifdef typo
+https://gitlab.com/cki-project/kernel-ark/-/commit/8097fbfdc958f3b46fae70e593c65221b373626e
+ 8097fbfdc958f3b46fae70e593c65221b373626e ahci: thunderx2: Fix for errata that affects stop engine

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/0658489a43b63b3beb5912e72eaafa56b309c8e1
- 0658489a43b63b3beb5912e72eaafa56b309c8e1 kernel/rh_taint.c: Update to new messaging
+https://gitlab.com/cki-project/kernel-ark/-/commit/50f5d1278d3927a4fe64f52d8f098dc8fd70f1af
+ 50f5d1278d3927a4fe64f52d8f098dc8fd70f1af Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c2b0ee3626fa8d6055136df34bf4fc6a269db748
- c2b0ee3626fa8d6055136df34bf4fc6a269db748 Enable e1000 in rhel9 as unsupported
+https://gitlab.com/cki-project/kernel-ark/-/commit/a67c78d8f995bab09b4ba5d440610237472d2e19
+ a67c78d8f995bab09b4ba5d440610237472d2e19 tags.sh: Ignore redhat/rpm

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c4dc6159b73fe38945747602a3aa0feb4ad99198
- c4dc6159b73fe38945747602a3aa0feb4ad99198 redhat: Add mark_driver_deprecated()
+https://gitlab.com/cki-project/kernel-ark/-/commit/bd765dc97b11b68f772e662df0c03e5ceccdb9d0
+ bd765dc97b11b68f772e662df0c03e5ceccdb9d0 aarch64: acpi scan: Fix regression related to X-Gene UARTs

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/7fd167426eae31a76322e9d3b0fdd442cf78ffcb
- 7fd167426eae31a76322e9d3b0fdd442cf78ffcb [fs] dax: mark tech preview
+https://gitlab.com/cki-project/kernel-ark/-/commit/1b14c142506526498b6839daffedb5318e9331d3
+ 1b14c142506526498b6839daffedb5318e9331d3 ACPI / irq: Workaround firmware issue on X-Gene based m400

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/078b2927c3608ba41a4b74274675b081a5d7ff5d
- 078b2927c3608ba41a4b74274675b081a5d7ff5d [scsi] megaraid_sas: re-add certain pci-ids
+https://gitlab.com/cki-project/kernel-ark/-/commit/ceadcd821a820a3d4f93125393d6b853f5f8c789
+ ceadcd821a820a3d4f93125393d6b853f5f8c789 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/530f9fa2442694bedd7cedc9da3c97d796461ee1
- 530f9fa2442694bedd7cedc9da3c97d796461ee1 RHEL: disable io_uring support
+https://gitlab.com/cki-project/kernel-ark/-/commit/a61ca8bd4bc11f602e04a0263b4a54098f84ceda
+ a61ca8bd4bc11f602e04a0263b4a54098f84ceda Pull the RHEL version defines out of the Makefile

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b146b3a2bd8cae8b749c43669293c8caded4db35
- b146b3a2bd8cae8b749c43669293c8caded4db35 bpf: Fix unprivileged_bpf_disabled setup
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/e073a14d72e4ba48d4c0c10c5d207859c718cea8
- e073a14d72e4ba48d4c0c10c5d207859c718cea8 nvme: nvme_mpath_init remove multipath check
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f5293c7adecc3c3157889b50c3e3d82f386aa45c
- f5293c7adecc3c3157889b50c3e3d82f386aa45c team: mark team driver as deprecated
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9e462638759cb50d389ab5e968656a1e96275b9f
- 9e462638759cb50d389ab5e968656a1e96275b9f mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/17bfd84e1a7684f5c4ace2ed4a79c92441ca718e
- 17bfd84e1a7684f5c4ace2ed4a79c92441ca718e wireguard: disable in FIPS mode
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/571aa4c5e9cc05cbf9298c4d913638aa2f11737d
- 571aa4c5e9cc05cbf9298c4d913638aa2f11737d nvme: decouple basic ANA log page re-read support from native multipathing
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d155c59752beef25e1543f1c9045b4753b13f3c9
- d155c59752beef25e1543f1c9045b4753b13f3c9 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8ab6133f8948a100570cf1ee564ada3aef5e20be
- 8ab6133f8948a100570cf1ee564ada3aef5e20be nvme: Return BLK_STS_TARGET if the DNR bit is set
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c7c1f0006d10a23b72a2e86ef0935f187214fb35
- c7c1f0006d10a23b72a2e86ef0935f187214fb35 wireguard: mark as Tech Preview
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/7a35d1ee0dd3df20f623a48e693d3d60e74b3caf
- 7a35d1ee0dd3df20f623a48e693d3d60e74b3caf REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5ef324dd4a8ad84358a81453efc8550efdc9e3b0
- 5ef324dd4a8ad84358a81453efc8550efdc9e3b0 redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/68d7dfbdffa12d305cd744cca50ef0bf35380ce9
- 68d7dfbdffa12d305cd744cca50ef0bf35380ce9 arch/x86: Remove vendor specific CPU ID checks
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/fa59d93c0de20e9cc2c091794da003d97d48cde1
- fa59d93c0de20e9cc2c091794da003d97d48cde1 redhat: Replace hardware.redhat.com link in Unsupported message
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8d37d1405c8f5cb184a760586eca020c7583fcb5
- 8d37d1405c8f5cb184a760586eca020c7583fcb5 x86: Fix compile issues with rh_check_supported()
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/07db43366d560153fd1d418cfebe2370fb20697e
- 07db43366d560153fd1d418cfebe2370fb20697e KEYS: Make use of platform keyring for module signature verify
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/13f3a4bd05f23cc3c9bbb93101f8f7a5d2ad6286
- 13f3a4bd05f23cc3c9bbb93101f8f7a5d2ad6286 Input: rmi4 - remove the need for artificial IRQ in case of HID
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/82cdc768df1eb42e5daad59691faf59e30983d52
- 82cdc768df1eb42e5daad59691faf59e30983d52 ARM: tegra: usb no reset
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b8c1ba8e325647b60546176e829f5d9d3be412d2
- b8c1ba8e325647b60546176e829f5d9d3be412d2 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a0e2f7064d51b9b7138e1855d2ae91cbc218e983
- a0e2f7064d51b9b7138e1855d2ae91cbc218e983 redhat: rh_kabi: deduplication friendly structs
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/66f9d58d70e80c695c18708de878c1e29e37c705
- 66f9d58d70e80c695c18708de878c1e29e37c705 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/13844102e39d6e7edd0f0665c9f088548e9003f9
- 13844102e39d6e7edd0f0665c9f088548e9003f9 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a4a7bba5e3519ce442ed1343bff9fc07a27fbc16
- a4a7bba5e3519ce442ed1343bff9fc07a27fbc16 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8f0cbdd44ed769ede63b7c2528da7c4b1eb56fab
- 8f0cbdd44ed769ede63b7c2528da7c4b1eb56fab redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/296a59a80cc0fa0211c7b4876842a36880b4173c
- 296a59a80cc0fa0211c7b4876842a36880b4173c redhat: rh_kabi: Add macros to size and extend structs
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/3b3dc3b2773445b5186c7bf4cbdbfb64fb369a7f
- 3b3dc3b2773445b5186c7bf4cbdbfb64fb369a7f Removing Obsolete hba pci-ids from rhel8
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d4544515fce5ba0e9603734ee700e8d59399368a
- d4544515fce5ba0e9603734ee700e8d59399368a mptsas: pci-id table changes
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/82e9e7e8ec5ad50563d81c8586f0cfefdd7e3657
- 82e9e7e8ec5ad50563d81c8586f0cfefdd7e3657 mptsas: Taint kernel if mptsas is loaded
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8a510ceae03b00266b84853567d379d647ead58e
- 8a510ceae03b00266b84853567d379d647ead58e mptspi: pci-id table changes
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5c770972e93d1a7af3721fd0a45b0ed68f8be26e
- 5c770972e93d1a7af3721fd0a45b0ed68f8be26e qla2xxx: Remove PCI IDs of deprecated adapter
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/cfaac305bf236527dd2566c345ac4a751a04109c
- cfaac305bf236527dd2566c345ac4a751a04109c be2iscsi: remove unsupported device IDs
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/ae576960853e541a29f4b01e844ea3a9b86c4ffe
- ae576960853e541a29f4b01e844ea3a9b86c4ffe mptspi: Taint kernel if mptspi is loaded
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5a2f5bb69008366cdd25ca84dd37abbb5ccb581c
- 5a2f5bb69008366cdd25ca84dd37abbb5ccb581c hpsa: remove old cciss-based smartarray pci ids
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/88e71b03bba371d4aa4b6578e486142995a9ba55
- 88e71b03bba371d4aa4b6578e486142995a9ba55 qla4xxx: Remove deprecated PCI IDs from RHEL 8
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/96910e18cfed61a89caa38408bee0444941b2282
- 96910e18cfed61a89caa38408bee0444941b2282 aacraid: Remove depreciated device and vendor PCI id's
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/37d76f7deb53a3ab7af5ea50c095687a265b1f2f
- 37d76f7deb53a3ab7af5ea50c095687a265b1f2f megaraid_sas: remove deprecated pci-ids
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/2726b138d1f3e2066a2940917b19591c92747057
- 2726b138d1f3e2066a2940917b19591c92747057 mpt*: remove certain deprecated pci-ids
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/c8c5dc6f59c058417b5741477cae5a1b33b58858
- c8c5dc6f59c058417b5741477cae5a1b33b58858 kernel: add SUPPORT_REMOVED kernel taint
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/277fc21e1f81d6314ede837c2570296393bbfb68
- 277fc21e1f81d6314ede837c2570296393bbfb68 Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d3235d10f1f4b9a6d0b31516fb914bd1e69d849e
- d3235d10f1f4b9a6d0b31516fb914bd1e69d849e s390: Lock down the kernel when the IPL secure flag is set
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a54b5fcf2794d2eb55a1bb58db4979c0721136e5
- a54b5fcf2794d2eb55a1bb58db4979c0721136e5 efi: Lock down the kernel if booted in secure boot mode
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/779176ca1e772ba2009c4865038452d165281fbb
- 779176ca1e772ba2009c4865038452d165281fbb efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/41f6da72dece639d8214e80e1790ea79c08a45b7
- 41f6da72dece639d8214e80e1790ea79c08a45b7 security: lockdown: expose a hook to lock the kernel down
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/605f63b4b9b94780279223878956c281338b6ede
- 605f63b4b9b94780279223878956c281338b6ede Make get_cert_list() use efi_status_to_str() to print error messages.
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/1f8e78f62bcb67092358d05cd316f19fa929b638
- 1f8e78f62bcb67092358d05cd316f19fa929b638 Add efi_status_to_str() and rework efi_status_to_err().
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/55b01b9cd5549ddbf340828529fb8c25ba4e1edb
- 55b01b9cd5549ddbf340828529fb8c25ba4e1edb Add support for deprecating processors
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4e88a9d9858ad61467bee7798695a5fbe82cef00
- 4e88a9d9858ad61467bee7798695a5fbe82cef00 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9a66e3f38865ee8acea564a8c6c8b5da31b25868
- 9a66e3f38865ee8acea564a8c6c8b5da31b25868 iommu/arm-smmu: workaround DMA mode issues
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/3a66e92c56fb46ac7fe5b407e1557caf1eacb808
- 3a66e92c56fb46ac7fe5b407e1557caf1eacb808 rh_kabi: introduce RH_KABI_EXCLUDE
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a049a3e1a788f499fd5095541343a060f261988b
- a049a3e1a788f499fd5095541343a060f261988b ipmi: do not configure ipmi for HPE m400
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/1667acd2103bde76933c8f2186c6f174568a6a7b
- 1667acd2103bde76933c8f2186c6f174568a6a7b kABI: Add generic kABI macros to use for kABI workarounds
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/e2c9a30f37d972ebd96981754fed6ac8d44d23a5
- e2c9a30f37d972ebd96981754fed6ac8d44d23a5 add pci_hw_vendor_status()
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4d9bdf2e45b1ab5896eb0a721d07472a7a946018
- 4d9bdf2e45b1ab5896eb0a721d07472a7a946018 ahci: thunderx2: Fix for errata that affects stop engine
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/96a369cdbdec9b9a9fafe89d5ede0954a0f00e5a
- 96a369cdbdec9b9a9fafe89d5ede0954a0f00e5a Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/008acc460d1f7fbeaf505e070b1534280254cd26
- 008acc460d1f7fbeaf505e070b1534280254cd26 bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/556222ae9207b2daa5b906c32e45e70428013af3
- 556222ae9207b2daa5b906c32e45e70428013af3 add Red Hat-specific taint flags
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5c5f16a1d9e8bc75730b501519c963fe7b0257ab
- 5c5f16a1d9e8bc75730b501519c963fe7b0257ab tags.sh: Ignore redhat/rpm
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/37aa3c0686feb58dc8fc3ed1722acc28c95d5d7a
- 37aa3c0686feb58dc8fc3ed1722acc28c95d5d7a put RHEL info into generated headers
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a48d050cf3820e8d06c05b872dbcaa04ac1c240f
- a48d050cf3820e8d06c05b872dbcaa04ac1c240f aarch64: acpi scan: Fix regression related to X-Gene UARTs
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/91f74734ff359e320e1dd56f8ffe2d43b7cde32a
- 91f74734ff359e320e1dd56f8ffe2d43b7cde32a ACPI / irq: Workaround firmware issue on X-Gene based m400
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b8eda51b11a2be42e499c9e8205b5cd7c39c7873
- b8eda51b11a2be42e499c9e8205b5cd7c39c7873 modules: add rhelversion MODULE_INFO tag
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/7d425ebdb3f8a801072bb1632752817b9901e5b2
- 7d425ebdb3f8a801072bb1632752817b9901e5b2 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4a358dc4687934055e4a1e0d74bef24ae9d12b50
- 4a358dc4687934055e4a1e0d74bef24ae9d12b50 Add Red Hat tainting
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5a01163b9a00100c43bd6547d4ac012ce4d1d266
- 5a01163b9a00100c43bd6547d4ac012ce4d1d266 Introduce CONFIG_RH_DISABLE_DEPRECATED
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/51ec7bac154d32804dd88ccc5a858eff469631d8
- 51ec7bac154d32804dd88ccc5a858eff469631d8 Pull the RHEL version defines out of the Makefile
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/0420d9025d8e87fb0c419e70aeb76dc528a1fa3b
- 0420d9025d8e87fb0c419e70aeb76dc528a1fa3b [initial commit] Add Red Hat variables in the top level makefile
+https://gitlab.com/cki-project/kernel-ark/-/commit/70cf1cf208f8aa5ef855bda2a5ff8feecee2292c
+ 70cf1cf208f8aa5ef855bda2a5ff8feecee2292c [initial commit] Add Red Hat variables in the top level makefile

--- a/def_variants.yaml.fedora
+++ b/def_variants.yaml.fedora
@ -0,0 +1,506 @@
+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-rt-kvm
+    if_variant_in: ["rt"]
+    depends-on:
+    - modules-core
+
+
+rules:
+  - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
+    if_variant_in: ["rt"]
+
+  - 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/.*(kunit|test).*: modules-internal
+  - 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/.*test.*: modules-internal
+  - 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/dmatest.*: modules-internal
+  - 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/i915/kvmgt.*: modules-rt-kvm
+    if_variant_in: ["rt"]
+  - 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/tests/.*: modules-internal
+  - 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/.*test.*: modules-internal
+  - 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/test/.*: modules-internal
+  - 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/tests/.*: modules-internal
+  - drivers/input/touchscreen/.*: modules
+  - drivers/input/.*: modules-core
+  - drivers/interconnect/.*: modules-core
+  - drivers/iommu/.*test.ko: modules-internal
+  - 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/platform/chrome/.*test.*: modules-internal
+  - drivers/pmdomain/.*: modules-core
+  - drivers/powercap/intel_rapl_tpmi.*: modules
+  - drivers/powercap/.*: modules-core
+  - drivers/pps/.*: modules-core
+  - drivers/ptp/ptp_kvm.*: modules-rt-kvm
+    if_variant_in: ["rt"]
+  - 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/.*test.*: modules-internal
+  - 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/.*test.*: modules-internal
+  - 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/.*test.*: modules-internal
+  - kernel/locking/locktorture.*: modules-internal
+  - kernel/rcu/rcuscale.*: modules-internal
+  - kernel/rcu/rcutorture.*: modules-internal
+  - kernel/rcu/refscale.*: modules-internal
+  - kernel/resource_kunit.*: modules-internal
+  - kernel/scftorture.*: modules-internal
+  - kernel/torture.*: modules-internal
+  - kernel/.*: modules-core
+
+  - lib/.*(test|kunit).*: modules-internal
+  - lib/.*: modules-core
+
+  - mm/kasan/kasan_test: modules-internal
+  - mm/kfence/.*test.*: modules-internal
+
+  - net/.*test.*: modules-internal
+  - 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/sch_choke.*: modules-extra
+  - net/sched/sch_drr.*: modules-extra
+  - net/sched/sch_etf.*: modules-extra
+  - net/sched/sch_gred.*: modules-extra
+  - net/sched/sch_mqprio.ko: modules-extra
+  - net/sched/sch_multiq.*: modules-extra
+  - net/sched/sch_netem.*: modules-extra
+  - net/sched/sch_qfq.*: modules-extra
+  - net/sched/sch_red.*: modules-extra
+  - net/sched/sch_sfb.*: modules-extra
+  - net/sched/sch_teql.*: modules-extra
+  - net/sched/.*: modules-core
+  - net/sunrpc/xprtrdma/rpcrdma.*: modules
+  - net/sunrpc/.*: modules-core
+  - net/tipc/.*: modules-core
+  - net/tls/.*: modules-core
+  - net/vmw_vsock/.*: modules-core
+  - net/xdp/.*: modules-core
+  - net/xfrm/.*: modules-core
+
+  - sound/pci/.*test.*: modules-internal
+  - sound/soc/.*test.*: modules-internal
+
+  - virt/.*: modules-core
+
+  - default: modules
--- a/def_variants.yaml.rhel
+++ b/def_variants.yaml.rhel
@ -0,0 +1,523 @@
+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-rt-kvm
+    if_variant_in: ["rt"]
+    depends-on:
+    - modules-core
+  - name: modules-partner
+    depends-on:
+    - modules-core
+    - modules
+
+rules:
+  - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
+    if_variant_in: ["rt"]
+
+  - 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/.*(kunit|test).*: modules-internal
+  - 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/.*test.*: modules-internal
+  - 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/dmatest.*: modules-internal
+  - 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/i915/kvmgt.*: modules-rt-kvm
+    if_variant_in: ["rt"]
+  - 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/tests/.*: modules-internal
+  - 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/.*test.*: modules-internal
+  - 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/iio/test/.*: modules-internal
+  - drivers/input/gameport/.*: modules
+  - drivers/input/joystick/.*: modules-extra
+  - drivers/input/tablet/.*: modules
+  - drivers/input/tests/.*: modules-internal
+  - drivers/input/touchscreen/.*: modules
+  - drivers/input/.*: modules-core
+  - drivers/interconnect/.*: modules-core
+  - drivers/iommu/.*test.ko: modules-internal
+  - 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/chrome/.*test.*: modules-internal
+  - 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_kvm.*: modules-rt-kvm
+    if_variant_in: ["rt"]
+  - 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/.*test.*: modules-internal
+  - 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-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/.*: 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/.*test.*: modules-internal
+  - 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/.*test.*: modules-internal
+  - kernel/locking/locktorture.*: modules-internal
+  - kernel/rcu/rcuscale.*: modules-internal
+  - kernel/rcu/rcutorture.*: modules-internal
+  - kernel/rcu/refscale.*: modules-internal
+  - kernel/resource_kunit.*: modules-internal
+  - kernel/scftorture.*: modules-internal
+  - kernel/torture.*: modules-internal
+  - kernel/.*: modules-core
+
+  - lib/test_lockup.*: modules-extra
+  - lib/.*(test|kunit).*: modules-internal
+  - lib/.*: modules-core
+
+  - mm/kasan/kasan_test: modules-internal
+  - mm/kfence/.*test.*: modules-internal
+  - mm/zsmalloc.ko: modules-core
+
+  - net/.*test.*: modules-internal
+  - 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/sch_choke.*: modules-extra
+  - net/sched/sch_drr.*: modules-extra
+  - net/sched/sch_gred.*: modules-extra
+  - net/sched/sch_mqprio.ko: modules-extra
+  - net/sched/sch_multiq.*: modules-extra
+  - net/sched/sch_netem.*: modules-extra
+  - net/sched/sch_qfq.*: modules-extra
+  - net/sched/sch_red.*: modules-extra
+  - net/sched/sch_sfb.*: modules-extra
+  - net/sched/sch_teql.*: modules-extra
+  - net/sched/.*: modules-core
+  - net/sctp/.*: modules-extra
+  - net/sunrpc/xprtrdma/rpcrdma.*: modules
+  - 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
+  - sound/pci/.*test.*: modules-internal
+  - sound/soc/.*test.*: modules-internal
+
+  - virt/.*: modules-core
+
+  - default: modules
--- a/dracut-virt.conf
+++ b/dracut-virt.conf
@ -12,7 +12,20 @@ dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usr
 dracutmodules+=" dm lvm rootfs-block fs-lib "

 # modules: tpm and crypto
-dracutmodules+=" crypt crypt-loop tpm2-tss "
+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 "

 # drivers: virtual buses, pci
 drivers+=" virtio-pci virtio-mmio "      # qemu-kvm
@ -28,8 +41,8 @@ drivers+=" xen-blkfront "                # xen
 # root encryption
 drivers+=" dm_crypt "

+# root disk integrity protection
+drivers+=" dm_verity overlay "
+
 # filesystems
 filesystems+=" vfat ext4 xfs overlay "
-
-# systemd-pcrphase
-install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service "
--- a/fedoraimaca.x509
+++ b/fedoraimaca.x509
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@ -1,18 +0,0 @@
-#! /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 nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa"
--- a/filter-aarch64.sh.rhel
+++ b/filter-aarch64.sh.rhel
@ -1,18 +0,0 @@
-#! /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-modules.sh.fedora
+++ b/filter-modules.sh.fedora
@ -1,201 +0,0 @@
-#! /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"
-
-cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat"
-
-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 mlx5-vfio-pci video int3406_thermal apple_bl ptp_dfl_tod intel-m10-bmc-hwmon intel_rapl_tpmi pds_vdpa hp-wmi-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
-
-# Filter the crypto drivers
-for crypt in ${cryptdrvs}
-do
-	filter_dir $1 drivers/crypto/${crypt}
-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
@ -1,177 +0,0 @@
-#! /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 isst_if_common isst_tpmi_core isst_tpmi intel_vsec intel_vsec_tpmi"
-
-# 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"
-
-cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat"
-
-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 coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs smb 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 video apple_bl kasan_test intel-m10-bmc-hwmon"
-
-# 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
-
-# Filter the crypto drivers
-for crypt in ${cryptdrvs}
-do
-	filter_dir $1 drivers/crypto/${crypt}
-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
@ -1,14 +0,0 @@
-#! /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 mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod pds_vdpa"
--- a/filter-ppc64le.sh.rhel
+++ b/filter-ppc64le.sh.rhel
@ -1,14 +0,0 @@
-#! /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
@ -1,12 +0,0 @@
-#! /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
@ -1,12 +0,0 @@
-#! /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
@ -1,12 +0,0 @@
-#! /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
@ -1,12 +0,0 @@
-#! /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/gating.yaml
+++ b/gating.yaml
@ -1,9 +1,14 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-*
 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/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-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.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-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.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-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
--- a/kernel.changelog
+++ b/kernel.changelog
--- a/kernel.spec
+++ b/kernel.spec
--- a/mod-denylist.sh
+++ b/mod-denylist.sh
@ -1,18 +1,16 @@
 #! /bin/bash
 # shellcheck disable=SC2164

-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"
+rpm_buildroot="$1"
+module_dir="$2"
+module_list="$3"
+
+blacklist_conf_files="$(mktemp)"

 blacklist()
 {
-	cat > "$RpmDir/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
+	mkdir -p "$rpm_buildroot/etc/modprobe.d/"
+	cat > "$rpm_buildroot/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.
@ -21,11 +19,12 @@ 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=$(find "$RpmDir/$ModDir" -name "$1")
+	mod="$rpm_buildroot/$1"
 	[ ! "$mod" ] && return 0
 	if modinfo "$mod" | grep -q '^alias:\s\+net-'; then
 		mod="${1##*/}"
@ -35,28 +34,6 @@ 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)
@ -74,80 +51,17 @@ 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 [ -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=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*)
+floppylist=("$rpm_buildroot"/"$module_dir"/kernel/drivers/block/floppy.ko*)
 if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then
     blacklist "floppy"
 fi

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

-pushd "$Dir"
-rm modnames dep.list dep2.list req.list req2.list
-rm "$ListName" modules2.list modules3.list
-popd
+cat "$blacklist_conf_files" >> "$module_list"
+rm -f "$blacklist_conf_files"
--- a/mod-extra.list.fedora
+++ b/mod-extra.list.fedora
@ -1,201 +0,0 @@
-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
-dln2-adc.ko
-dln2.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
-gpio-dln2.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
-i2c-dln2.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
-spi-dln2.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
-wwan_hwsim.ko
-yam.ko
-zhenhua.ko
--- a/mod-extra.list.rhel
+++ b/mod-extra.list.rhel
@ -1,327 +0,0 @@
-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
-arptable_filter.ko
-arp_tables.ko
-arpt_mangle.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
-br_netfilter.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
-ebt_802_3.ko
-ebtable_broute.ko
-ebtable_filter.ko
-ebtable_nat.ko
-ebtables.ko
-ebt_among.ko
-ebt_arp.ko
-ebt_arpreply.ko
-ebt_dnat.ko
-ebt_ip6.ko
-ebt_ip.ko
-ebt_limit.ko
-ebt_log.ko
-ebt_mark.ko
-ebt_mark_m.ko
-ebt_nflog.ko
-ebt_pkttype.ko
-ebt_redirect.ko
-ebt_snat.ko
-ebt_stp.ko
-ebt_vlan.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
-ip6table_filter.ko
-ip6table_mangle.ko
-ip6table_nat.ko
-ip6table_raw.ko
-ip6table_security.ko
-ip6_tables.ko
-ip6t_ah.ko
-ip6t_eui64.ko
-ip6t_frag.ko
-ip6t_hbh.ko
-ip6t_ipv6header.ko
-ip6t_mh.ko
-ip6t_NPT.ko
-ip6t_REJECT.ko
-ip6t_rpfilter.ko
-ip6t_rt.ko
-ipddp.ko
-ip_set_bitmap_ip.ko
-ip_set_bitmap_ipmac.ko
-ip_set_bitmap_port.ko
-ip_set_hash_ip.ko
-ip_set_hash_ipmac.ko
-ip_set_hash_ipmark.ko
-ip_set_hash_ipportip.ko
-ip_set_hash_ipport.ko
-ip_set_hash_ipportnet.ko
-ip_set_hash_mac.ko
-ip_set_hash_netiface.ko
-ip_set_hash_net.ko
-ip_set_hash_netnet.ko
-ip_set_hash_netport.ko
-ip_set_hash_netportnet.ko
-ip_set.ko
-ip_set_list_set.ko
-iptable_filter.ko
-iptable_mangle.ko
-iptable_nat.ko
-iptable_raw.ko
-iptable_security.ko
-ip_tables.ko
-ipt_ah.ko
-ipt_ECN.ko
-ipt_REJECT.ko
-ipt_rpfilter.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
-nft_compat.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
-wwan_hwsim.ko
-xt_addrtype.ko
-xt_AUDIT.ko
-xt_bpf.ko
-xt_cgroup.ko
-xt_CHECKSUM.ko
-xt_CLASSIFY.ko
-xt_cluster.ko
-xt_comment.ko
-xt_connbytes.ko
-xt_connlabel.ko
-xt_connlimit.ko
-xt_connmark.ko
-xt_CONNSECMARK.ko
-xt_conntrack.ko
-xt_cpu.ko
-xt_CT.ko
-xt_dccp.ko
-xt_devgroup.ko
-xt_dscp.ko
-xt_DSCP.ko
-xt_ecn.ko
-xt_esp.ko
-xt_hashlimit.ko
-xt_helper.ko
-xt_hl.ko
-xt_HL.ko
-xt_HMARK.ko
-xt_IDLETIMER.ko
-xt_iprange.ko
-xt_ipvs.ko
-xt_length.ko
-xt_limit.ko
-xt_LOG.ko
-xt_mac.ko
-xt_mark.ko
-xt_MASQUERADE.ko
-xt_multiport.ko
-xt_nat.ko
-xt_NETMAP.ko
-xt_NFLOG.ko
-xt_NFQUEUE.ko
-xt_osf.ko
-xt_owner.ko
-xt_physdev.ko
-xt_pkttype.ko
-xt_policy.ko
-xt_quota.ko
-xt_rateest.ko
-xt_RATEEST.ko
-xt_realm.ko
-xt_recent.ko
-xt_REDIRECT.ko
-xt_sctp.ko
-xt_SECMARK.ko
-xt_set.ko
-xt_socket.ko
-xt_state.ko
-xt_statistic.ko
-xt_string.ko
-xt_tcpmss.ko
-xt_TCPMSS.ko
-xt_TCPOPTSTRIP.ko
-xt_TEE.ko
-xt_TPROXY.ko
-xt_TRACE.ko
-yam.ko
-zhenhua.ko
--- a/mod-internal.list
+++ b/mod-internal.list
@ -1,88 +0,0 @@
-bitfield_kunit
-checksum_kunit
-clk-gate_test
-clk_test
-cmdline_kunit
-cpumask_kunit
-cros_kunit
-dev_addr_lists_test
-dmatest
-drm_buddy_test
-drm_cmdline_parser_test
-drm_connector_test
-drm_damage_helper_test
-drm_dp_mst_helper_test
-drm_format_helper_test
-drm_format_test
-drm_framebuffer_test
-drm_kunit_helpers
-drm_managed_test
-drm_mm_test
-drm_modes_test
-drm_plane_helper_test
-drm_probe_helper_test
-drm_rect_test
-ext4-inode-test
-fat_test
-fortify_kunit
-gss_krb5_test
-handshake-test
-hashtable_test
-hid-uclogic-test
-iio-test-format
-iio-test-rescale
-input_test
-is_signed_type_kunit
-kasan_test
-kfence_test
-kunit
-kunit-test
-lib_test
-list-test
-locktorture
-mac80211_hwsim
-memcpy_kunit
-mptcp_crypto_test
-mptcp_token_test
-mtty
-netdevsim
-overflow_kunit
-pktgen
-rational-test
-rcuscale
-rcutorture
-refscale
-regmap-kunit
-resource_kunit
-rocker
-scftorture
-siphash_kunit
-slub_kunit
-soc-topology-test
-soc-utils-test
-stackinit_kunit
-strcat_kunit
-strscpy_kunit
-sysctl-test
-test_bits
-test_bpf
-test_hash
-test_hmm
-test_kasan
-test_klp_atomic_replace
-test_klp_callbacks_busy
-test_klp_callbacks_demo
-test_klp_callbacks_demo2
-test_klp_callbacks_mod
-test_klp_livepatch
-test_klp_shadow_vars
-test_klp_state
-test_klp_state2
-test_klp_state3
-test_kprobes
-test_linear_ranges
-test_list_sort
-test_sort
-test_vmalloc
-time_test
-torture
--- a/mod-kvm.list
+++ b/mod-kvm.list
@ -1,5 +0,0 @@
-kvm-amd
-kvm-intel
-kvm
-kvmgt
-ptp_kvm
--- a/mod-partner.list
+++ b/mod-partner.list
@ -1,2 +0,0 @@
-afs
-rxrpc
--- a/nvidiagpuoot001.x509
+++ b/nvidiagpuoot001.x509
--- a/partial-clang-debug-snip.config
+++ b/partial-clang-debug-snip.config
@ -0,0 +1,4 @@
+# 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
@ -0,0 +1,4 @@
+# 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
@ -0,0 +1,4 @@
+# clang_lto
+# CONFIG_DRM_WERROR is not set
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
--- a/partial-clang_lto-aarch64-snip.config
+++ b/partial-clang_lto-aarch64-snip.config
@ -0,0 +1,6 @@
+# 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
@ -0,0 +1,4 @@
+# clang_lto
+# CONFIG_DRM_WERROR is not set
+CONFIG_KASAN_STACK=y
+# CONFIG_KMSAN is not set
--- a/partial-clang_lto-x86_64-snip.config
+++ b/partial-clang_lto-x86_64-snip.config
@ -0,0 +1,6 @@
+# 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-kgcov-debug-snip.config
+++ b/partial-kgcov-debug-snip.config
@ -0,0 +1,4 @@
+# kgcov
+CONFIG_GCOV_KERNEL=y
+CONFIG_GCOV_PROFILE_ALL=y
+# CONFIG_GCOV_PROFILE_FTRACE is not set
--- a/patch-6.11-redhat.patch
+++ b/patch-6.11-redhat.patch
--- a/patch-6.5-redhat.patch
+++ b/patch-6.5-redhat.patch
--- a/process_configs.sh
+++ b/process_configs.sh
@ -148,7 +148,8 @@ parsenewconfigs()
        /usr/bin/awk -v BASE="$tmpdir" '
                BEGIN { inpatch=0;
 			outfile="none";
-                        symbol="none"; }
+                        symbol="none";
+                        commit=""; }
                /^Symbol: .*$/ {
                        split($0, a, " ");
                        symbol="CONFIG_"a[2];
@ -160,9 +161,11 @@ parsenewconfigs()
 			}
                        else {
                                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;
@ -173,6 +176,15 @@ 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
--- a/redhatsecureboot003.cer
+++ b/redhatsecureboot003.cer
--- a/redhatsecureboot401.cer
+++ b/redhatsecureboot401.cer
--- a/redhatsecureboot501.cer
+++ b/redhatsecureboot501.cer
--- a/redhatsecurebootca2.cer
+++ b/redhatsecurebootca2.cer
--- a/redhatsecurebootca4.cer
+++ b/redhatsecurebootca4.cer
--- a/redhatsecurebootca5.cer
+++ b/redhatsecurebootca5.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
@ -23,7 +23,7 @@ emptyrpm:
 patches:
    ignore_list:
        - linux-kernel-test.patch
-        - patch-6.5-redhat.patch
+        - patch-6.11-redhat.patch

 runpath:
    ignore:
--- a/8
+++ b/8
@ -1,3 +1,5 @@
-SHA512 (linux-6.5.tar.xz) = a95de013fcf667d300b38f9b8ec9b744b922404389437bd5508d33340a0de9e047d12525b70b5341cd760e7877761d59f7c89a44d15238365a2a033d5c85dd36
-SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 2d661551aefa33068c871d35770648a90e4b3f11727d20f1c34c44a210e5e862b3a68a0b63e8923c2455467acffdc2b58f24f44def86387b589b35bc2a130035
-SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 2ff74a4ec08bfdf01f32136206e657763212515d31babb5fe61e2d857e417d29a2b6a778c2eeb572d289c93df8d834c7ec419c464d9eb5b7d8fa0ef94a3a9d3a
+SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = 7130ba0d72e398ae63bd0192e5e765885d8b932ff10c22f214821387588c358a21c8460561993baab0e5cd48afbad08db822cc49e5e3ae2d927b328de2072e7a
+SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a
+SHA512 (linux-6.11.9.tar.xz) = e5400b7f755fa7ce213b1b395a5a548014da524c4d31188d44181ac7fe0db178d2d5bb0d8a34d84e44712f20053428ec163f80d880a32dbab82f8592b3b257e7
+SHA512 (kernel-abi-stablelists-6.11.9.tar.xz) = 29b51ddc8122f70ccdabd3960efd531cafd7c90f5f61e031cf5abc2e2ae42c7b515c572612cf862a90ce6042eaeebe43c330fe74bfee3ad12677a99c5d10327a
+SHA512 (kernel-kabi-dw-6.11.9.tar.xz) = 4675f6e36cbd701ea77d3ec51e79279f10b75d24bf8a4da751064e52cd0e5c269f112478e5c432caf30f9f9fdc8ac13e826ae8011cf61e82626d552d7b783caa
--- a/uki_addons.json
+++ b/uki_addons.json
@ -0,0 +1,12 @@
+{
+    "virt": {
+        "common": {
+            "fips-disable.addon": [
+                "fips=0\n"
+            ],
+            "fips-enable.addon": [
+                "fips=1\n"
+            ]
+        }
+    }
+}
--- a/uki_create_addons.py
+++ b/uki_create_addons.py
@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+#
+# This script inspects a given json proving a list of addons, and
+# creates an addon for each key/value pair matching the given uki, distro and
+# arch provided in input.
+#
+# Usage: python uki_create_addons.py input_json out_dir uki distro arch
+#
+# This tool requires the systemd-ukify and systemd-boot packages.
+#
+# Addon file
+#-----------
+# Each addon terminates with .addon
+# Each addon contains only two types of lines:
+# Lines beginning with '#' are description and thus ignored
+# All other lines are command line to be added.
+# The name of the end resulting addon is taken from the json hierarchy.
+# For example, and addon in json['virt']['rhel']['x86_64']['hello.addon'] will
+# result in an UKI addon file generated in out_dir called
+# hello-virt.rhel.x86_64.addon.efi
+#
+# The common key, present in any sub-dict in the provided json (except the leaf dict)
+# is used as place for default addons when the same addon is not defined deep
+# in the hierarchy. For example, if we define test.addon (text: 'test1\n') in
+# json['common']['test.addon'] = ['test1\n'] and another test.addon (text: test2) in
+# json['virt']['common']['test.addon'] = ['test2'], any other uki except virt
+# will have a test.addon.efi with text "test1", and virt will have a
+# test.addon.efi with "test2"
+#
+# sbat.conf
+#----------
+# This dict is containing the sbat string for *all* addons being created.
+# This dict is optional, but when used has to be put in a sub-dict with
+# { 'sbat' : { 'sbat.conf' : ['your text here'] }}
+# It follows the same syntax as the addon files, meaning '#' is comment and
+# the rest is taken as sbat string and feed to ukify.
+
+import os
+import sys
+import json
+import collections
+import subprocess
+
+
+UKIFY_PATH = '/usr/lib/systemd/ukify'
+
+def usage(err):
+    print(f'Usage: {os.path.basename(__file__)} input_json output_dir uki distro arch')
+    print(f'Error:{err}')
+    sys.exit(1)
+
+def check_clean_arguments(input_json, out_dir):
+    # Remove end '/'
+    if out_dir[-1:] == '/':
+        out_dir = out_dir[:-1]
+    if not os.path.isfile(input_json):
+        usage(f'input_json {input_json} is not a file, or does not exist!')
+    if not os.path.isdir(out_dir):
+        usage(f'out_dir_dir {out_dir} is not a dir, or does not exist!')
+    return out_dir
+
+UKICmdlineAddon = collections.namedtuple('UKICmdlineAddon', ['name', 'cmdline'])
+uki_addons_list = []
+uki_addons = {}
+addon_sbat_string = None
+
+def parse_lines(lines, rstrip=True):
+    cmdline = ''
+    for l in lines:
+        l = l.lstrip()
+        if not l:
+            continue
+        if l[0] == '#':
+            continue
+        # rstrip is used only for addons cmdline, not sbat.conf, as it replaces
+        # return lines with spaces.
+        if rstrip:
+            l = l.rstrip() + ' '
+        cmdline += l
+    if cmdline == '':
+        return ''
+    return cmdline
+
+def parse_all_addons(in_obj):
+    global addon_sbat_string
+
+    for el in in_obj.keys():
+        # addon found: copy it in our global dict uki_addons
+        if el.endswith('.addon'):
+            uki_addons[el] = in_obj[el]
+
+    if 'sbat' in in_obj and 'sbat.conf' in in_obj['sbat']:
+        # sbat.conf found: override sbat with the most specific one found
+        addon_sbat_string = parse_lines(in_obj['sbat']['sbat.conf'], rstrip=False)
+
+def recursively_find_addons(in_obj, folder_list):
+    # end of recursion, leaf directory. Search all addons here
+    if len(folder_list) == 0:
+        parse_all_addons(in_obj)
+        return
+
+    # first, check for common folder
+    if 'common' in in_obj:
+        parse_all_addons(in_obj['common'])
+
+    # second, check if there is a match with the searched folder
+    if folder_list[0] in in_obj:
+        folder_next = in_obj[folder_list[0]]
+        folder_list = folder_list[1:]
+        recursively_find_addons(folder_next, folder_list)
+
+def parse_in_json(in_json, uki_name, distro, arch):
+    with open(in_json, 'r') as f:
+        in_obj = json.load(f)
+    recursively_find_addons(in_obj, [uki_name, distro, arch])
+
+    for addon_name, cmdline in uki_addons.items():
+        addon_name = addon_name.replace(".addon","")
+        addon_full_name = f'{addon_name}-{uki_name}.{distro}.{arch}.addon.efi'
+        cmdline = parse_lines(cmdline).rstrip()
+        if cmdline:
+            uki_addons_list.append(UKICmdlineAddon(addon_full_name, cmdline))
+
+def create_addons(out_dir):
+    for uki_addon in uki_addons_list:
+        out_path = os.path.join(out_dir, uki_addon.name)
+        cmd = [
+            f'{UKIFY_PATH}', 'build',
+            f'--cmdline="{uki_addon.cmdline}"',
+            f'--output={out_path}']
+        if addon_sbat_string:
+            cmd.append('--sbat="' + addon_sbat_string.rstrip() +'"')
+
+        subprocess.check_call(cmd, text=True)
+
+if __name__ == "__main__":
+    argc = len(sys.argv) - 1
+    if argc != 5:
+        usage('too few or too many parameters!')
+
+    input_json = sys.argv[1]
+    out_dir = sys.argv[2]
+    uki_name = sys.argv[3]
+    distro = sys.argv[4]
+    arch = sys.argv[5]
+
+    out_dir = check_clean_arguments(input_json, out_dir)
+    parse_in_json(input_json, uki_name, distro, arch)
+    create_addons(out_dir)
+
+
--- a/update_scripts.sh
+++ b/update_scripts.sh
@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]; then
-	exit 1
-fi
-
-TARGET="$1"
-
-for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
-	NEW=${i%."$TARGET"}
-	cp "$i" "$(basename "$NEW")"
-done