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>

Makefile.rhelver

@@ -1,4 +1,4 @@
-RHEL_MAJOR = 10
+RHEL_MAJOR = 9
 RHEL_MINOR = 99
 
 #
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 38
+RHEL_RELEASE = 0
 
 #
 # RHEL_REBASE_NUM
@@ -50,11 +50,31 @@ RHEL_REBASE_NUM = 1
 ZSTREAM ?= no
 
 #
-# Automotive
-# ----------
+# Early y+1 numbering
+# --------------------
 #
-# Represents the major and minor release used by automotive.
-# Primarily this is used to to identify the build target when
-# building the automotive kernel package.
-AUTOMOTIVE_MAJOR = 2
-AUTOMOTIVE_MINOR = 99
+# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y
+# First is RHEL_RELEASE inherited/merged from y as-is, second number
+# is incremented with each build starting from 1. After merge from y,
+# it resets back to 1. This way y+1 nvr reflects status of last merge.
+#
+# Example:
+#
+# rhel8.0                        rhel-8.1
+#   kernel-4.18.0-58.el8   -->     kernel-4.18.0-58.1.el8
+#                                  kernel-4.18.0-58.2.el8
+#   kernel-4.18.0-59.el8           kernel-4.18.0-59.1.el8
+#   kernel-4.18.0-60.el8
+#   kernel-4.18.0-61.el8   -->     kernel-4.18.0-61.1.el8
+#
+#
+# Use this spot to avoid future merge conflicts.
+# Do not trim this comment.
+EARLY_YSTREAM ?= no
+EARLY_YBUILD:=
+EARLY_YRELEASE:=
+ifneq ("$(ZSTREAM)", "yes")
+  ifeq ("$(EARLY_YSTREAM)","yes")
+    RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
+  endif
+endif

Patchlist.changelog

@@ -1,474 +1,150 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/831ff9bcd8e9eab864062470a3250beb1e1ec924
- 831ff9bcd8e9eab864062470a3250beb1e1ec924 rust: Add -fdiagnostics-show-context to bindgen_skip_c_flags
+https://gitlab.com/cki-project/kernel-ark/-/commit/41149211717aeda4414e41a5eddee11b605f3a85
+ 41149211717aeda4414e41a5eddee11b605f3a85 Revert "cpupower: Bump soname version"
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/fe3e9e24af806d756edbda922103b1fa95d9b89b
- fe3e9e24af806d756edbda922103b1fa95d9b89b Revert "Removing Obsolete hba pci-ids from rhel8"
+https://gitlab.com/cki-project/kernel-ark/-/commit/5726a406fa039a9c1cf831953428f87caff38745
+ 5726a406fa039a9c1cf831953428f87caff38745 Bluetooth: btusb: Fix not being able to reconnect after suspend
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/c4a0a995da9df8732f688d09db5252173277589d
- c4a0a995da9df8732f688d09db5252173277589d rh_messages.h: add missing lpfc devices
+https://gitlab.com/cki-project/kernel-ark/-/commit/b4af2ea6127c979d151fe78817cb86e999d0323b
+ b4af2ea6127c979d151fe78817cb86e999d0323b Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/0ad9a88c3263fa8fa39437f69472588917255c99
- 0ad9a88c3263fa8fa39437f69472588917255c99 kernel: extend rh_waived to cope better with the CVE mitigations case
+https://gitlab.com/cki-project/kernel-ark/-/commit/b630c41705d79da0dfb19aa07a8985ba6fb61a02
+ b630c41705d79da0dfb19aa07a8985ba6fb61a02 HID: amd_sfh: Switch to device-managed dmam_alloc_coherent()
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/cf18c49636f2583c85831f909699034026325242
- cf18c49636f2583c85831f909699034026325242 rh_messages.h: add missing aacraid device
+https://gitlab.com/cki-project/kernel-ark/-/commit/15cf18f2e233b61e3a7514c214baa47b49c7e2bc
+ 15cf18f2e233b61e3a7514c214baa47b49c7e2bc wifi: rtw89: pci: early chips only enable 36-bit DMA on specific PCI hosts
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/26ca931184edb2c3c7f7c1951f53fa3333d9c90e
- 26ca931184edb2c3c7f7c1951f53fa3333d9c90e rh_messages.h: update unmaintained drivers
+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/c1c1a1b7059900f4b9b657f5189285a287160e11
- c1c1a1b7059900f4b9b657f5189285a287160e11 arm64: add early lockdown for secure boot
+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/a613ae52a8d9378e6fa70f697b3ce0acee220491
- a613ae52a8d9378e6fa70f697b3ce0acee220491 efi: pass secure boot mode to kernel proper
+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/f869258b6b654d316e84325e46e431da4dfd04e7
- f869258b6b654d316e84325e46e431da4dfd04e7 selftests/bpf: Remove ksyms_weak_lskel 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/8b69219fe6a11766cf1a2e07dc94e56448b47824
- 8b69219fe6a11766cf1a2e07dc94e56448b47824 Simplify include Makefile.rhelver
+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/c2621ac616e25a9a04fbcb8af0c1f8b2bdd8c099
- c2621ac616e25a9a04fbcb8af0c1f8b2bdd8c099 redhat: make ENABLE_WERROR also enable OBJTOOL_WERROR
+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/d28cbdeb89fe565e10fb4be8d8378153e86611f6
- d28cbdeb89fe565e10fb4be8d8378153e86611f6 main.c: fix initcall blacklisted
+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/b71ab57c8db44881edc32a124ddc2ebe536b6a4c
- b71ab57c8db44881edc32a124ddc2ebe536b6a4c arch/x86/kernel/setup.c: fix rh_check_supported
+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/c4ea2384863e54e0c5582b3508518e659581ce69
- c4ea2384863e54e0c5582b3508518e659581ce69 efi,lockdown: fix kernel lockdown on Secure Boot
+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/60b2ddeb0986e1c43a98b44a4ab414a7e2744701
- 60b2ddeb0986e1c43a98b44a4ab414a7e2744701 Revert "nvme: Return BLK_STS_TARGET if the DNR bit is set"
+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/860632dd288c7aa7807959a79af9159482510cd1
- 860632dd288c7aa7807959a79af9159482510cd1 Revert "nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT"
+https://gitlab.com/cki-project/kernel-ark/-/commit/1bd2b8b9cdd378bc0bcc46ffb3580b810b22bec5
+ 1bd2b8b9cdd378bc0bcc46ffb3580b810b22bec5 crypto: akcipher - Disable signing and decryption
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/aaef2c3ee081c8980bb60fd4b7a6ed9e187d9048
- aaef2c3ee081c8980bb60fd4b7a6ed9e187d9048 Revert "nvme: decouple basic ANA log page re-read support from native multipathing"
+https://gitlab.com/cki-project/kernel-ark/-/commit/35655c383bfd88c12f760899ea64659da5a29627
+ 35655c383bfd88c12f760899ea64659da5a29627 crypto: dh - implement FIPS PCT
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/5cd4353dae0ee79d13f57b7ccee85cd0bcbe4b4f
- 5cd4353dae0ee79d13f57b7ccee85cd0bcbe4b4f Revert "nvme: nvme_mpath_init remove multipath check"
+https://gitlab.com/cki-project/kernel-ark/-/commit/dc99bf18097cb54436cdea0c68844819d2adfe75
+ dc99bf18097cb54436cdea0c68844819d2adfe75 crypto: ecdh - disallow plain "ecdh" usage in FIPS mode
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/656a0565ffe54f99ac1390a68c5ee7050ab6fb25
- 656a0565ffe54f99ac1390a68c5ee7050ab6fb25 redhat: automotive: define CONFIG_RH_AUTOMOTIVE
+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/f1025d6236c72b4fbd03940b6fa2178f2a84f418
- f1025d6236c72b4fbd03940b6fa2178f2a84f418 redhat: fix modules.order target
+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/6e0fa997052c92d6085a50083e75dedc0160443f
- 6e0fa997052c92d6085a50083e75dedc0160443f [redhat] rh_messages.h: driver and device updates
+https://gitlab.com/cki-project/kernel-ark/-/commit/f8e0850f38863ef52f2cd55fdcdb3abaaad9e73e
+ f8e0850f38863ef52f2cd55fdcdb3abaaad9e73e lsm: update security_lock_kernel_down
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/d8822fd0573e9f254f097c1743078e4e74ac70f5
- d8822fd0573e9f254f097c1743078e4e74ac70f5 crypto: rng - Fix extrng EFAULT handling
+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/c224e4b6a61af08574bb0565755ed609bf08cacb
- c224e4b6a61af08574bb0565755ed609bf08cacb crypto: sig - Disable signing
+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/39417e970be7f6bc63f34d5ed5511f7e629802c2
- 39417e970be7f6bc63f34d5ed5511f7e629802c2 crypto: rng - Ensure stdrng is tested before user-space starts
+https://gitlab.com/cki-project/kernel-ark/-/commit/87bee3c15d593cdf1f4c337d65900cc8639459e2
+ 87bee3c15d593cdf1f4c337d65900cc8639459e2 Enable IO_URING for RHEL
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/52be246b6342ed5b1486729fd5c5893b10549a92
- 52be246b6342ed5b1486729fd5c5893b10549a92 [redhat] rh_messages.h: Mark BlueField-4 as disabled
+https://gitlab.com/cki-project/kernel-ark/-/commit/c1791b7d3183881333af9a8fec60565ac55cad61
+ c1791b7d3183881333af9a8fec60565ac55cad61 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/2c9e64af9fa1f8599ce05877441afcac8ac91b04
- 2c9e64af9fa1f8599ce05877441afcac8ac91b04 Update the RHEL_DIFFERENCES help string
+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/beef34cb1efc34b7fbee35535c66915995d12ed1
- beef34cb1efc34b7fbee35535c66915995d12ed1 redhat: include resolve_btfids in kernel-devel
+https://gitlab.com/cki-project/kernel-ark/-/commit/baf728d501a2661e474ebbae11d667849e17d29b
+ baf728d501a2661e474ebbae11d667849e17d29b redhat:  adapt to upstream Makefile change
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/1a1426b7a8df854c78385dd8ce8b74e9ee641477
- 1a1426b7a8df854c78385dd8ce8b74e9ee641477 redhat: workaround CKI cross compilation for scripts
+https://gitlab.com/cki-project/kernel-ark/-/commit/472b92a5d9724cbbd0607fd5d82947764c2b972f
+ 472b92a5d9724cbbd0607fd5d82947764c2b972f Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/2c83d6cfffe1f891bf024df81be6cd41c2073ad9
- 2c83d6cfffe1f891bf024df81be6cd41c2073ad9 crypto: akcipher - Disable signing and decryption
+https://gitlab.com/cki-project/kernel-ark/-/commit/d75c410357fb64130d57d556ff9229139c14a8e8
+ d75c410357fb64130d57d556ff9229139c14a8e8 RHEL: disable io_uring support
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/af93553b8d335ccf5dd4f90ab9419e497aa36a80
- af93553b8d335ccf5dd4f90ab9419e497aa36a80 crypto: dh - implement FIPS PCT
+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/f0540d9d32978dff227cbb930193e8dc2557b23b
- f0540d9d32978dff227cbb930193e8dc2557b23b crypto: ecdh - disallow plain "ecdh" usage in FIPS mode
+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/243ef89ad354eea332d7bfb23fd4cf259240de91
- 243ef89ad354eea332d7bfb23fd4cf259240de91 crypto: seqiv - flag instantiations as FIPS compliant
+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/6a23cbc588e9b9f7b2bc7250c6c6903d4d904eb1
- 6a23cbc588e9b9f7b2bc7250c6c6903d4d904eb1 [kernel] bpf: set default value for bpf_jit_harden
+https://gitlab.com/cki-project/kernel-ark/-/commit/1ed5225c5a34662ad010075699d8790f5b7171dc
+ 1ed5225c5a34662ad010075699d8790f5b7171dc ARM: tegra: usb no reset
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/bb84b630a172d0204c8d243c57a6a1d2eae7843c
- bb84b630a172d0204c8d243c57a6a1d2eae7843c not upstream: Disable vdso getrandom when FIPS is enabled
+https://gitlab.com/cki-project/kernel-ark/-/commit/b0ed5d1de8bc342f1620f00d8378a8c7b3f41e26
+ b0ed5d1de8bc342f1620f00d8378a8c7b3f41e26 s390: Lock down the kernel when the IPL secure flag is set
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/b643998c61552fb5615268e7e529999d64d54175
- b643998c61552fb5615268e7e529999d64d54175 Add support to rh_waived cmdline boot parameter
+https://gitlab.com/cki-project/kernel-ark/-/commit/a2c6c57e2d1d60148bc3e623dbc046aef65eacdb
+ a2c6c57e2d1d60148bc3e623dbc046aef65eacdb efi: Lock down the kernel if booted in secure boot mode
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/a1e04b6f3580382a902256c7bf8b395b9a1be47f
- a1e04b6f3580382a902256c7bf8b395b9a1be47f rh_flags: fix failed when register_sysctl_sz rh_flags_table to kernel
+https://gitlab.com/cki-project/kernel-ark/-/commit/c9a7afaa703bfd5c439fcada879031982e1f31a5
+ c9a7afaa703bfd5c439fcada879031982e1f31a5 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/03cf1862c6221ee2a6de9a5ab25adaec6460b62e
- 03cf1862c6221ee2a6de9a5ab25adaec6460b62e [redhat] rh_flags: constify the ctl_table argument of proc_handler
+https://gitlab.com/cki-project/kernel-ark/-/commit/044abfe144b8f9413327cb5f6de53fa65bee13fa
+ 044abfe144b8f9413327cb5f6de53fa65bee13fa security: lockdown: expose a hook to lock the kernel down
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/e2708e55f9151652da80e388b4bf88c649288c0f
- e2708e55f9151652da80e388b4bf88c649288c0f redhat: rh_flags: declare proper static methods when !CONFIG_RHEL_DIFFERENCES
+https://gitlab.com/cki-project/kernel-ark/-/commit/df4dc5c5082636ea3dd0096eae3e113c3b3903d7
+ df4dc5c5082636ea3dd0096eae3e113c3b3903d7 Make get_cert_list() use efi_status_to_str() to print error messages.
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/6f593811cc1e5664f45fe2d09916eada1187e992
- 6f593811cc1e5664f45fe2d09916eada1187e992 redhat: make bnx2xx drivers unmaintained in rhel-10
+https://gitlab.com/cki-project/kernel-ark/-/commit/8378c41fcd8c0fadf4d4e3d046870c570855dd5f
+ 8378c41fcd8c0fadf4d4e3d046870c570855dd5f Add efi_status_to_str() and rework efi_status_to_err().
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/5db8220bd67c719a20c1269233585b40f48837da
- 5db8220bd67c719a20c1269233585b40f48837da rh_flags: Rename rh_features to rh_flags
+https://gitlab.com/cki-project/kernel-ark/-/commit/1d98b5d2ef6e9b3bcb2e71e0b89a7777d28b87cb
+ 1d98b5d2ef6e9b3bcb2e71e0b89a7777d28b87cb arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/19ca502a0087eed65a014c6271f9bfc207d8d7eb
- 19ca502a0087eed65a014c6271f9bfc207d8d7eb kernel: rh_features: fix reading empty feature list from /proc
+https://gitlab.com/cki-project/kernel-ark/-/commit/0f01dc56b6690c204e534efead7f833a151668e4
+ 0f01dc56b6690c204e534efead7f833a151668e4 iommu/arm-smmu: workaround DMA mode issues
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/ba24639032f00b47748a6f39a4eb33950df015c2
- ba24639032f00b47748a6f39a4eb33950df015c2 rh_features: move rh_features entry to sys/kernel
+https://gitlab.com/cki-project/kernel-ark/-/commit/f4aceb8131752369713f8eedb949c72a6ff6f65b
+ f4aceb8131752369713f8eedb949c72a6ff6f65b ipmi: do not configure ipmi for HPE m400
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/883e43fe6a0da0d9ad90e7c997a95f11bab9b888
- 883e43fe6a0da0d9ad90e7c997a95f11bab9b888 rh_features: convert to atomic allocation
+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/c8daa2e832df14ee9174435a357b2ae0994a3ef3
- c8daa2e832df14ee9174435a357b2ae0994a3ef3 add rh_features to /proc
+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/4f33dbbe3ec578d49e12c07421b913bf480fccef
- 4f33dbbe3ec578d49e12c07421b913bf480fccef add support for rh_features
+https://gitlab.com/cki-project/kernel-ark/-/commit/a67c78d8f995bab09b4ba5d440610237472d2e19
+ a67c78d8f995bab09b4ba5d440610237472d2e19 tags.sh: Ignore redhat/rpm
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/53a5900b05260b81f13eb3b9d6a9419429f310ab
- 53a5900b05260b81f13eb3b9d6a9419429f310ab [redhat] PCI: Fix pci_rh_check_status() call semantics
+https://gitlab.com/cki-project/kernel-ark/-/commit/bd765dc97b11b68f772e662df0c03e5ceccdb9d0
+ bd765dc97b11b68f772e662df0c03e5ceccdb9d0 aarch64: acpi scan: Fix regression related to X-Gene UARTs
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/aeb9a237a0ec39b7bde89d8bb040cd5b267f6802
- aeb9a237a0ec39b7bde89d8bb040cd5b267f6802 scsi: sd: condition probe_type under RHEL_DIFFERENCES
+https://gitlab.com/cki-project/kernel-ark/-/commit/1b14c142506526498b6839daffedb5318e9331d3
+ 1b14c142506526498b6839daffedb5318e9331d3 ACPI / irq: Workaround firmware issue on X-Gene based m400
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/159e72af8b1631b720f4a7e0012fa624764cecde
- 159e72af8b1631b720f4a7e0012fa624764cecde scsi: sd: remove unused sd_probe_types
+https://gitlab.com/cki-project/kernel-ark/-/commit/ceadcd821a820a3d4f93125393d6b853f5f8c789
+ ceadcd821a820a3d4f93125393d6b853f5f8c789 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/d8c04860eb7bf29617ca1754f1076fd9f5992e77
- d8c04860eb7bf29617ca1754f1076fd9f5992e77 [redhat] rh_messages.h: mark mlx5 on Bluefield-3 as unmaintained
+https://gitlab.com/cki-project/kernel-ark/-/commit/a61ca8bd4bc11f602e04a0263b4a54098f84ceda
+ a61ca8bd4bc11f602e04a0263b4a54098f84ceda Pull the RHEL version defines out of the Makefile
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/496c64b4afece4ab525467a6be71ffe60d0c564f
- 496c64b4afece4ab525467a6be71ffe60d0c564f [redhat] rh_messages.h: initial driver and device lists
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5cf456aaba6f5c9406421c04c65d43b2c71f5927
- 5cf456aaba6f5c9406421c04c65d43b2c71f5927 arch/x86: Fix XSAVE check for x86_64-v2 check
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/252bf9586fca6e57a51966c0294a9a0cb33ff4f5
- 252bf9586fca6e57a51966c0294a9a0cb33ff4f5 arch/x86/kernel/setup.c: fixup rh_check_supported
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/30faf17591afbd4230d590355351044294ad43d2
- 30faf17591afbd4230d590355351044294ad43d2 lsm: update security_lock_kernel_down
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e88ee9e2e869e7259faa5bf3ff6689becabb53cb
- e88ee9e2e869e7259faa5bf3ff6689becabb53cb arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/26ebc304df38a49ce7cc69b4bdf220298cff2460
- 26ebc304df38a49ce7cc69b4bdf220298cff2460 redhat: kABI: add missing RH_KABI_SIZE_ALIGN_CHECKS Kconfig option
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8c71392703448be8e8217592dd46ea1cc8b157e1
- 8c71392703448be8e8217592dd46ea1cc8b157e1 redhat: rh_kabi: introduce RH_KABI_EXCLUDE_WITH_SIZE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/d42afcb843fcc87e59ba39b5574c18d89fd07a91
- d42afcb843fcc87e59ba39b5574c18d89fd07a91 redhat: rh_kabi: move semicolon inside __RH_KABI_CHECK_SIZE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/95a56955f9ba6ef1e1dd2d99d8f98254da274267
- 95a56955f9ba6ef1e1dd2d99d8f98254da274267 random: replace import_single_range() with import_ubuf()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/92d6612578b79fd3a09e10504ed71209ba43c271
- 92d6612578b79fd3a09e10504ed71209ba43c271 ext4: Mark mounting fs-verity filesystems as tech-preview
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5c51745b8aec113ff0605ab833c3e472d99c55c8
- 5c51745b8aec113ff0605ab833c3e472d99c55c8 erofs: Add tech preview markers at mount
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6d687c70a7eda10eac0ddc6eedeaccc30eef5349
- 6d687c70a7eda10eac0ddc6eedeaccc30eef5349 kernel/rh_messages.c: Mark functions as possibly unused
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/dfb09b1d833cad815ea2f5cb69505010de260c40
- dfb09b1d833cad815ea2f5cb69505010de260c40 crypto: rng - Override drivers/char/random in FIPS mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ddbe3667f2462817f3f936141fff08604dde1564
- ddbe3667f2462817f3f936141fff08604dde1564 random: Add hook to override device reads and getrandom(2)
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/92525a9129d85fa6400c9e653379862a67cb43b2
- 92525a9129d85fa6400c9e653379862a67cb43b2 [redhat] kernel/rh_messages.c: move hardware tables to rh_messages.h
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/eacd81fdaf31d456a82c553735faf64c8efad2eb
- eacd81fdaf31d456a82c553735faf64c8efad2eb [redhat] kernel/rh_messages.c: Wire up new calls
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/32af8640a651c642ee5706dda0cf35ff508bcdcb
- 32af8640a651c642ee5706dda0cf35ff508bcdcb [redhat] drivers/pci: Update rh_messages.c
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/db366977f9e13f903cc9b7f22936b581594a7731
- db366977f9e13f903cc9b7f22936b581594a7731 [redhat] drivers/pci: Remove RHEL-only pci_hw_*() functions
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/402504ff66e5d118b514253df5d55f8413e2e167
- 402504ff66e5d118b514253df5d55f8413e2e167 scsi: sd: Add "probe_type" module parameter to allow synchronous probing
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5e96a345c6fb24e282ce1769223c1a339d0dbe94
- 5e96a345c6fb24e282ce1769223c1a339d0dbe94 Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ce943989ae8cb2b8e0b4699c148584d3cd18ec9b
- ce943989ae8cb2b8e0b4699c148584d3cd18ec9b kernel/rh_messages.c: Another gcc12 warning on redundant NULL test
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c0624b3913d8c3f262e20910a2f2c4d2f99ce61f
- c0624b3913d8c3f262e20910a2f2c4d2f99ce61f Enable IO_URING for RHEL
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/861f2d38d82cfb374799ec517f18cc021701068e
- 861f2d38d82cfb374799ec517f18cc021701068e Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e02ec93117d6eea21e80baf69e6f9848cf1a9774
- e02ec93117d6eea21e80baf69e6f9848cf1a9774 redhat: version two of Makefile.rhelver tweaks
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/964e830b4fae678dec5b8b93dcd402c73fdf2912
- 964e830b4fae678dec5b8b93dcd402c73fdf2912 redhat:  adapt to upstream Makefile change
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/60a4025a3b1cdec1c7bbdabf1e30278f615bb493
- 60a4025a3b1cdec1c7bbdabf1e30278f615bb493 kernel/rh_messages.c: gcc12 warning on redundant NULL test
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a5c9e3c6e3dcda60b5f753d1bae86a686f3ac087
- a5c9e3c6e3dcda60b5f753d1bae86a686f3ac087 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/092e751fe418623c5ad04e77fa6c993d48d96533
- 092e751fe418623c5ad04e77fa6c993d48d96533 ARK: Remove code marking devices unmaintained
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c27fa327fb3de69773568d211fd2f8f13a72e342
- c27fa327fb3de69773568d211fd2f8f13a72e342 rh_message: Fix function name
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c9b07fd3a141ad0283d7eaadf5a06aec9af2b8c9
- c9b07fd3a141ad0283d7eaadf5a06aec9af2b8c9 Add Partner Supported taint flag to kAFS
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6b0e3a47ec436527a736c0e7159b41624d176dd9
- 6b0e3a47ec436527a736c0e7159b41624d176dd9 Add Partner Supported taint flag
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/3a4e2ad92c430d2f584f56ca686bc75a469d06c0
- 3a4e2ad92c430d2f584f56ca686bc75a469d06c0 kabi: Add kABI macros for enum type
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/04fbd46f834f3a012ca9d5bef91db377a3dbaed0
- 04fbd46f834f3a012ca9d5bef91db377a3dbaed0 kabi: expand and clarify documentation of aux structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/cf8df8ef88e094ebb049a7e1e6fec069aaf54faa
- cf8df8ef88e094ebb049a7e1e6fec069aaf54faa kabi: introduce RH_KABI_USE_AUX_PTR
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/31779ca0c6c9aab28184a42ac3f17ac219b37b2b
- 31779ca0c6c9aab28184a42ac3f17ac219b37b2b kabi: rename RH_KABI_SIZE_AND_EXTEND to AUX
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/2e12a05d339ed936b9cd59f420b161d70b4a130a
- 2e12a05d339ed936b9cd59f420b161d70b4a130a kabi: more consistent _RH_KABI_SIZE_AND_EXTEND
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/b83556eebdc2efdc2d2c22610b7cd7c5cafb2bae
- b83556eebdc2efdc2d2c22610b7cd7c5cafb2bae kabi: use fixed field name for extended part
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4c9a3b306a34ed7017e35b0de26b2d98e1a04373
- 4c9a3b306a34ed7017e35b0de26b2d98e1a04373 kabi: fix dereference in RH_KABI_CHECK_EXT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a961660df0a73bcf2dcd8cb8855c2f5d5ded0ae9
- a961660df0a73bcf2dcd8cb8855c2f5d5ded0ae9 kabi: fix RH_KABI_SET_SIZE macro
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9f9ef5e8b4694fa7fb6a8f941fb741121fe5aab3
- 9f9ef5e8b4694fa7fb6a8f941fb741121fe5aab3 kabi: expand and clarify documentation
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/308d17beeaa6cb4a514f77319b636c9a2c15f5eb
- 308d17beeaa6cb4a514f77319b636c9a2c15f5eb kabi: make RH_KABI_USE replace any number of reserved fields
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f3d12dffffeee8d6692be46044b9fc8448901692
- f3d12dffffeee8d6692be46044b9fc8448901692 kabi: rename RH_KABI_USE2 to RH_KABI_USE_SPLIT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/520e726b4e78101e73fa3d77cdcbc21d204a75a9
- 520e726b4e78101e73fa3d77cdcbc21d204a75a9 kabi: change RH_KABI_REPLACE2 to RH_KABI_REPLACE_SPLIT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/7160868bd40d04e6d1a80f55d1bf9bb62ede0ba3
- 7160868bd40d04e6d1a80f55d1bf9bb62ede0ba3 kabi: change RH_KABI_REPLACE_UNSAFE to RH_KABI_BROKEN_REPLACE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0b83063cf6c57dc20a80c35396fa425ec1963d53
- 0b83063cf6c57dc20a80c35396fa425ec1963d53 kabi: introduce RH_KABI_ADD_MODIFIER
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/d276c2393792e3eec80a73a4fe964f9ec11145a7
- d276c2393792e3eec80a73a4fe964f9ec11145a7 kabi: Include kconfig.h
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/28c30de9c771ff91994c9f0a42bdcc260fa97c2d
- 28c30de9c771ff91994c9f0a42bdcc260fa97c2d kabi: macros for intentional kABI breakage
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9b671c725ac69c47874321e5636e6541bb6d219d
- 9b671c725ac69c47874321e5636e6541bb6d219d kabi: fix the note about terminating semicolon
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6443eef17fb53f62886ecce519b6e12dd310e7f5
- 6443eef17fb53f62886ecce519b6e12dd310e7f5 kabi: introduce RH_KABI_HIDE_INCLUDE and RH_KABI_FAKE_INCLUDE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/47746fc3837b476ec265e2a0c2aaa86de0d3994e
- 47746fc3837b476ec265e2a0c2aaa86de0d3994e pci.h: Fix static include
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/67ce66385c6b619356c4030e6163c4fb18a50427
- 67ce66385c6b619356c4030e6163c4fb18a50427 drivers/pci/pci-driver.c: Fix if/ifdef typo
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0dfd7feeadc964ef2a9d118218b54831381c8d7a
- 0dfd7feeadc964ef2a9d118218b54831381c8d7a kernel/rh_taint.c: Update to new messaging
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/35e5ee153637e59c9297c9cc8ba7f3960277ffc2
- 35e5ee153637e59c9297c9cc8ba7f3960277ffc2 redhat: Add mark_driver_deprecated()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ff7aa8cae4c7e3e7bbc1bb5612efc2157c81fa7d
- ff7aa8cae4c7e3e7bbc1bb5612efc2157c81fa7d RHEL: disable io_uring support
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/517351ed810bf2707e7fdb2ab22029aeb594db59
- 517351ed810bf2707e7fdb2ab22029aeb594db59 bpf: Fix unprivileged_bpf_disabled setup
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/48fe2e5f40c901e92d1f8c62bc97f58af4b0906a
- 48fe2e5f40c901e92d1f8c62bc97f58af4b0906a nvme: nvme_mpath_init remove multipath check
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/1c9bd09f303e2c9d2c67fdc46604d94e00cbf67c
- 1c9bd09f303e2c9d2c67fdc46604d94e00cbf67c wireguard: disable in FIPS mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/57872981891fe8f3f7205daa4b78c8c0d676b171
- 57872981891fe8f3f7205daa4b78c8c0d676b171 nvme: decouple basic ANA log page re-read support from native multipathing
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0561f5953431ff471193611cd73af65dd394c8cd
- 0561f5953431ff471193611cd73af65dd394c8cd nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f801483d711fa5f83a0f9d4c479eeba702d1d477
- f801483d711fa5f83a0f9d4c479eeba702d1d477 nvme: Return BLK_STS_TARGET if the DNR bit is set
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4f2bc09956ad4829d139e9d69b86ba8b9ebc66e2
- 4f2bc09956ad4829d139e9d69b86ba8b9ebc66e2 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/65a21d545cc43328ea00fdbd62e7b45f375adce8
- 65a21d545cc43328ea00fdbd62e7b45f375adce8 redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/1c1b5380b0b56d3be978997b128f84aeb9906656
- 1c1b5380b0b56d3be978997b128f84aeb9906656 arch/x86: Remove vendor specific CPU ID checks
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f7c032c856ba6379a77b76179d0352929d6039ec
- f7c032c856ba6379a77b76179d0352929d6039ec redhat: Replace hardware.redhat.com link in Unsupported message
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9a6eb49603959cf0aab0198e13946eaee07801c3
- 9a6eb49603959cf0aab0198e13946eaee07801c3 x86: Fix compile issues with rh_check_supported()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8a605436efddfa7dbc6e007b2881fa81f17968a5
- 8a605436efddfa7dbc6e007b2881fa81f17968a5 KEYS: Make use of platform keyring for module signature verify
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c7c191f662438423a23592db42838ff550c2bdda
- c7c191f662438423a23592db42838ff550c2bdda Input: rmi4 - remove the need for artificial IRQ in case of HID
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4ae139284600cd6fef133ce7a981485ea73381ab
- 4ae139284600cd6fef133ce7a981485ea73381ab ARM: tegra: usb no reset
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8156e2102f753bbe0f0dd222a5f232e7f3d99883
- 8156e2102f753bbe0f0dd222a5f232e7f3d99883 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/823e733a88ddd21c735288dd3b08348e79872b91
- 823e733a88ddd21c735288dd3b08348e79872b91 redhat: rh_kabi: deduplication friendly structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/61d2a751fe1b1305684d6c1899f26fa9e38ac0a9
- 61d2a751fe1b1305684d6c1899f26fa9e38ac0a9 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/7d09cb3ea3dd2f3cda5a6a31be429f259106ca61
- 7d09cb3ea3dd2f3cda5a6a31be429f259106ca61 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c0c51c6f123df02948e11680d9b90324593ba547
- c0c51c6f123df02948e11680d9b90324593ba547 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/96b20c70b39cd28efcec2336417cb0db9ff7853c
- 96b20c70b39cd28efcec2336417cb0db9ff7853c redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/198030a81d85dbac8f4030e69d3d376327433487
- 198030a81d85dbac8f4030e69d3d376327433487 redhat: rh_kabi: Add macros to size and extend structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/695af00ed9e393abe88d9ee4de3702c15ded186d
- 695af00ed9e393abe88d9ee4de3702c15ded186d Removing Obsolete hba pci-ids from rhel8
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/736038bd8039d1543468c1dc8925f20929645804
- 736038bd8039d1543468c1dc8925f20929645804 mptsas: pci-id table changes
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/83cdf2924bdcc90c433a58129b4501e10b1295dc
- 83cdf2924bdcc90c433a58129b4501e10b1295dc mptspi: pci-id table changes
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0b634d81ed7f0730e13d720508dbaa6ab94e54d2
- 0b634d81ed7f0730e13d720508dbaa6ab94e54d2 qla2xxx: Remove PCI IDs of deprecated adapter
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0d11491f9e7fe0c8c301db3256cb47c66ae8450f
- 0d11491f9e7fe0c8c301db3256cb47c66ae8450f hpsa: remove old cciss-based smartarray pci ids
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/75f69a4f7b8f9d38c5efb0231186ed8726e526f2
- 75f69a4f7b8f9d38c5efb0231186ed8726e526f2 kernel: add SUPPORT_REMOVED kernel taint
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/50081b0865239d853d77bc71e54d13fad8bac9f0
- 50081b0865239d853d77bc71e54d13fad8bac9f0 Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/dc84f3cc1b19a0524e58a382c382f34081dc6c35
- dc84f3cc1b19a0524e58a382c382f34081dc6c35 s390: Lock down the kernel when the IPL secure flag is set
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/cb55378c04d6516f303e98061ec7ddd6563429a8
- cb55378c04d6516f303e98061ec7ddd6563429a8 efi: Lock down the kernel if booted in secure boot mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9b06e1f07c3cc9e1d0533b8615426d4d5d9e4ebb
- 9b06e1f07c3cc9e1d0533b8615426d4d5d9e4ebb efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/db249925c6802b38d910927e4d032af1e00bee56
- db249925c6802b38d910927e4d032af1e00bee56 security: lockdown: expose a hook to lock the kernel down
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f9604bcd305aba2a94e713ee758a51143687ae9f
- f9604bcd305aba2a94e713ee758a51143687ae9f Make get_cert_list() use efi_status_to_str() to print error messages.
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/b75eb3e922c93d78d4190a759f5725e856d35439
- b75eb3e922c93d78d4190a759f5725e856d35439 Add efi_status_to_str() and rework efi_status_to_err().
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/2f80042d6b8199fceadf3623243402066e0cd4ea
- 2f80042d6b8199fceadf3623243402066e0cd4ea Add support for deprecating processors
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5a3b4f5754788e42db8ed550b359382b600f2b08
- 5a3b4f5754788e42db8ed550b359382b600f2b08 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/36cd5d0a0aa0a3be8ac385ca8991563c9e58227f
- 36cd5d0a0aa0a3be8ac385ca8991563c9e58227f iommu/arm-smmu: workaround DMA mode issues
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ca34010e072550c8d5ea57f9436bab254c3521cc
- ca34010e072550c8d5ea57f9436bab254c3521cc rh_kabi: introduce RH_KABI_EXCLUDE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/26054e2c4e2253fe955a351971dc6b931cb68961
- 26054e2c4e2253fe955a351971dc6b931cb68961 ipmi: do not configure ipmi for HPE m400
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9cb0f734492a21a7e506d7145caf143ccd927b2a
- 9cb0f734492a21a7e506d7145caf143ccd927b2a kABI: Add generic kABI macros to use for kABI workarounds
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4960e5ee4a0e9bb28e512eb35cfa633ac4552049
- 4960e5ee4a0e9bb28e512eb35cfa633ac4552049 add pci_hw_vendor_status()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/291c4e2878431fd6937c5b9248babe8ec8d4233e
- 291c4e2878431fd6937c5b9248babe8ec8d4233e ahci: thunderx2: Fix for errata that affects stop engine
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/996869cc0b3e78cb9182a4ebced2c46ee2774935
- 996869cc0b3e78cb9182a4ebced2c46ee2774935 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c1c7a887998ab12c5a1180c4bca3b41c31fe4aa6
- c1c7a887998ab12c5a1180c4bca3b41c31fe4aa6 bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e40c9d10474d1a5b5f7f01175a72ba4a3c7f5e8e
- e40c9d10474d1a5b5f7f01175a72ba4a3c7f5e8e add Red Hat-specific taint flags
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f23f446b724fbb79c1e09a278fcb427fc29c0c05
- f23f446b724fbb79c1e09a278fcb427fc29c0c05 tags.sh: Ignore redhat/rpm
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a68aa65a20fba1908a7326e5321ce8bc39a9ae14
- a68aa65a20fba1908a7326e5321ce8bc39a9ae14 put RHEL info into generated headers
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/80937f1973d73fccdc75db4026fbed7cba16f489
- 80937f1973d73fccdc75db4026fbed7cba16f489 aarch64: acpi scan: Fix regression related to X-Gene UARTs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/3362fd10fe075b48ff8af023da5643bc9477a4c6
- 3362fd10fe075b48ff8af023da5643bc9477a4c6 ACPI / irq: Workaround firmware issue on X-Gene based m400
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ffc66b174954abecfb360dcc3b98c3139ef12d96
- ffc66b174954abecfb360dcc3b98c3139ef12d96 modules: add rhelversion MODULE_INFO tag
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/7e469c23b8f648d79e8a0e82ee41cda0e50b2f19
- 7e469c23b8f648d79e8a0e82ee41cda0e50b2f19 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/a0f49117d038de2d4db4940f5f039addb2f7231d
- a0f49117d038de2d4db4940f5f039addb2f7231d Add Red Hat tainting
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/fa67c16e780ed355f9847da90e8055ad1175c238
- fa67c16e780ed355f9847da90e8055ad1175c238 Introduce CONFIG_RH_DISABLE_DEPRECATED
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e7e1371803470a7840dc61da628cb912834ec149
- e7e1371803470a7840dc61da628cb912834ec149 Pull the RHEL version defines out of the Makefile
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/84d1d3e3d0c2c7ed1f571c8495bad3b4d97cfa8e
- 84d1d3e3d0c2c7ed1f571c8495bad3b4d97cfa8e [initial commit] Add Red Hat variables in the top level makefile
+https://gitlab.com/cki-project/kernel-ark/-/commit/70cf1cf208f8aa5ef855bda2a5ff8feecee2292c
+ 70cf1cf208f8aa5ef855bda2a5ff8feecee2292c [initial commit] Add Red Hat variables in the top level makefile
 

def_variants.yaml.fedora

@@ -12,12 +12,15 @@ packages:
     depends-on:
     - modules-core
     - modules
+  - name: modules-rt-kvm
+    if_variant_in: ["rt"]
+    depends-on:
+    - modules-core
 
 
 rules:
-  - .*kunit.*: modules-internal
-    exact_pkg: True
-  - .*test[^/]*.ko: modules-internal
+  - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
+    if_variant_in: ["rt"]
 
   - arch/.*: modules-core
   - crypto/.*: modules-core
@@ -28,6 +31,7 @@ rules:
   - 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
@@ -38,6 +42,7 @@ rules:
   - 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
@@ -52,6 +57,7 @@ rules:
   - 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
@@ -65,6 +71,8 @@ rules:
   - 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
@@ -77,6 +85,7 @@ rules:
   - 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
@@ -89,6 +98,7 @@ rules:
   - 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
@@ -117,14 +127,17 @@ rules:
   - 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
 
@@ -239,10 +252,13 @@ rules:
   - 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
@@ -254,6 +270,7 @@ rules:
   - 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
@@ -357,6 +374,7 @@ rules:
   - 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
@@ -395,16 +413,23 @@ rules:
   - 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
@@ -453,6 +478,17 @@ rules:
   - net/rds/rds.*: modules-extra
   - net/rose/rose.*: modules-extra
   - net/rxrpc/.*: modules-core
+  - net/sched/sch_choke.*: modules-extra
+  - net/sched/sch_drr.*: modules-extra
+  - net/sched/sch_etf.*: modules-extra
+  - net/sched/sch_gred.*: modules-extra
+  - net/sched/sch_mqprio.ko: modules-extra
+  - net/sched/sch_multiq.*: modules-extra
+  - net/sched/sch_netem.*: modules-extra
+  - net/sched/sch_qfq.*: modules-extra
+  - net/sched/sch_red.*: modules-extra
+  - net/sched/sch_sfb.*: modules-extra
+  - net/sched/sch_teql.*: modules-extra
   - net/sched/.*: modules-core
   - net/sunrpc/xprtrdma/rpcrdma.*: modules
   - net/sunrpc/.*: modules-core
@@ -462,6 +498,9 @@ rules:
   - net/xdp/.*: modules-core
   - net/xfrm/.*: modules-core
 
+  - sound/pci/.*test.*: modules-internal
+  - sound/soc/.*test.*: modules-internal
+
   - virt/.*: modules-core
 
   - default: modules

def_variants.yaml.rhel

@@ -12,15 +12,18 @@ packages:
     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:
-  - .*kunit.*: modules-internal
-    exact_pkg: True
-  - .*test[^/]*.ko: modules-internal
+  - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
+    if_variant_in: ["rt"]
 
   - arch/.*: modules-core
   - block/t10-pi.ko: modules-core
@@ -32,6 +35,7 @@ rules:
   - 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
@@ -43,6 +47,7 @@ rules:
   - 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
@@ -58,6 +63,7 @@ rules:
   - 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
@@ -71,6 +77,8 @@ rules:
   - 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
@@ -83,6 +91,7 @@ rules:
   - 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
@@ -95,6 +104,7 @@ rules:
   - 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
@@ -119,12 +129,15 @@ rules:
   - 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
 
@@ -242,11 +255,14 @@ rules:
   - 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
@@ -258,6 +274,7 @@ rules:
   - 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
@@ -333,7 +350,7 @@ rules:
   - drivers/usb/misc/.*: modules
   - drivers/usb/serial/.*: modules
   - drivers/usb/typec/mux/nb7vpq904m.*: modules
-  - drivers/usb/usbip/.*: modules-internal
+  - drivers/usb/usbip/.*: modules-extra
   - drivers/usb/.*: modules-core
 
   - drivers/vdpa/mlx5/mlx5_vdpa.*: modules
@@ -364,6 +381,7 @@ rules:
   - 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
@@ -403,18 +421,25 @@ rules:
   - 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
@@ -469,6 +494,16 @@ rules:
   - net/rds/rds.*: modules-extra
   - net/rose/rose.*: modules-extra
   - net/rxrpc/.*: modules-partner
+  - net/sched/sch_choke.*: modules-extra
+  - net/sched/sch_drr.*: modules-extra
+  - net/sched/sch_gred.*: modules-extra
+  - net/sched/sch_mqprio.ko: modules-extra
+  - net/sched/sch_multiq.*: modules-extra
+  - net/sched/sch_netem.*: modules-extra
+  - net/sched/sch_qfq.*: modules-extra
+  - net/sched/sch_red.*: modules-extra
+  - net/sched/sch_sfb.*: modules-extra
+  - net/sched/sch_teql.*: modules-extra
   - net/sched/.*: modules-core
   - net/sctp/.*: modules-extra
   - net/sunrpc/xprtrdma/rpcrdma.*: modules
@@ -480,6 +515,8 @@ rules:
   - net/xfrm/.*: modules-core
 
   - samples/.*: modules-internal
+  - sound/pci/.*test.*: modules-internal
+  - sound/soc/.*test.*: modules-internal
 
   - virt/.*: modules-core
 

dracut-virt.conf

@@ -6,7 +6,7 @@ compress="xz"
 early_microcode="no"
 
 # modules: basics
-dracutmodules+=" dracut-systemd i18n shutdown "
+dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown "
 
 # modules: storage support
 dracutmodules+=" dm lvm rootfs-block fs-lib "
@@ -27,16 +27,6 @@ dracutmodules+=" systemd-sysext "
 # modules: root disk integrity protection
 dracutmodules+=" systemd-veritysetup "
 
-# modules: root creation and encryption
-dracutmodules+=" systemd-repart "
-# FIXME: remove this once RHEL-103385 is merged
-install_items+=" /usr/sbin/mkfs.vfat /usr/sbin/mkfs.ext4 /usr/sbin/mkfs.xfs "
-
-# modules: FIPS
-dracutmodules+=" fips "
-# FIPS mode requires early crypto drivers test
-drivers+=" =crypto "
-
 # drivers: virtual buses, pci
 drivers+=" virtio-pci virtio-mmio "      # qemu-kvm
 drivers+=" hv-vmbus pci-hyperv "         # hyperv

filtermods.py

@@ -823,12 +823,11 @@ class FiltermodTests(unittest.TestCase):
                                                    do_pictures=FiltermodTests.do_pictures,
                                                    variants=['rt'])
 
-        self.assertIsNotNone(self.pkg_list.get('modules-other'))
+        self.assertIsNotNone(self.pkg_list.get('rt-kvm'))
         self._is_kmod_pkg('kmod1', 'modules-core')
         self._is_kmod_pkg('kmod2', 'modules-core')
         self._is_kmod_pkg('kmod3', 'modules')
-        self._is_kmod_pkg('kmod4', 'modules-other')
-
+        self._is_kmod_pkg('kmod4', 'rt-kvm')
 
     def test2(self):
         self.pkg_list, self.kmod_list = sort_kmods(get_td('test2.dep'), get_td('test2.yaml'),

kernel.sbat.template

@@ -1,2 +0,0 @@
-sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com

partial-clang_lto-aarch64-debug-snip.config

@@ -1,6 +1,4 @@
 # clang_lto
-# CONFIG_AUTOFDO_CLANG is not set
 # CONFIG_DRM_WERROR is not set
 CONFIG_KASAN_STACK=y
 # CONFIG_KMSAN is not set
-# CONFIG_PROPELLER_CLANG is not set

partial-clang_lto-x86_64-debug-snip.config

@@ -1,6 +1,4 @@
 # clang_lto
-# CONFIG_AUTOFDO_CLANG is not set
 # CONFIG_DRM_WERROR is not set
 CONFIG_KASAN_STACK=y
 # CONFIG_KMSAN is not set
-# CONFIG_PROPELLER_CLANG is not set

partial-clang_lto-x86_64-snip.config

@@ -1,8 +1,6 @@
 # clang_lto
-# CONFIG_AUTOFDO_CLANG is not set
 # CONFIG_DRM_WERROR is not set
 # CONFIG_KASAN_STACK is not set
 # CONFIG_KMSAN is not set
 CONFIG_LTO_CLANG_THIN=y
 # CONFIG_LTO_NONE is not set
-# CONFIG_PROPELLER_CLANG is not set

partial-kgcov-debug-snip.config

@@ -2,5 +2,3 @@
 CONFIG_GCOV_KERNEL=y
 CONFIG_GCOV_PROFILE_ALL=y
 # CONFIG_GCOV_PROFILE_FTRACE is not set
-CONFIG_GCOV_PROFILE_RDS=y
-CONFIG_GCOV_PROFILE_URING=y

partial-kgcov-snip.config

@@ -2,5 +2,3 @@
 CONFIG_GCOV_KERNEL=y
 CONFIG_GCOV_PROFILE_ALL=y
 # CONFIG_GCOV_PROFILE_FTRACE is not set
-CONFIG_GCOV_PROFILE_RDS=y
-CONFIG_GCOV_PROFILE_URING=y

process_configs.sh

@@ -1,24 +1,20 @@
 #!/bin/bash
 #
-# This script takes the merged config files and processes them through olddefconfig
-# and listnewconfig to ensure kernel configurations are valid and complete.
+# This script takes the merged config files and processes them through oldconfig
+# and listnewconfig
 #
 # Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands
 # shellcheck disable=SC2164
 
-# Exit if this is a test environment
 test -n "$RHTEST" && exit 0
 
-# Display usage information and available command line options
 usage()
 {
 	# alphabetical order please
 	echo "process_configs.sh [ options ] package_name kernel_version"
 	echo "     -a: report all errors, equivalent to [-c -n -w -i]"
 	echo "     -c: error on mismatched config options"
-	echo "     -i: ignore any errors, but print them"
-	echo "     -m: specify make options (e.g., -m CC=clang, -m LLVM=1)"
-	echo "     -M: commit mismatched configs to pending directory"
+	echo "     -i: continue on error"
 	echo "     -n: error on unset config options"
 	echo "     -t: test run, do not overwrite original config"
 	echo "     -w: error on misconfigured config options"
@@ -37,9 +33,6 @@ die()
 	exit 1
 }
 
-# Determine the correct cross-compiler prefix based on compiler type
-# For clang builds, return the architecture directly
-# For GCC builds, use the dummy-tools directory
 get_cross_compile()
 {
 	arch=$1
@@ -50,8 +43,7 @@ get_cross_compile()
 	fi
 }
 
-# Find the top-level kernel source directory
-# (identified by MAINTAINERS file and drivers directory)
+# stupid function to find top of tree to do kernel make configs
 switch_to_toplevel()
 {
 	path="$(pwd)"
@@ -68,124 +60,11 @@ switch_to_toplevel()
 	echo "$path"
 }
 
-# Determine the correct config path based on architecture and variant
-# This function maps arch/variant combinations to the proper pending directory
-determine_config_path()
-{
-	local arch="$1"
-	local variant="$2"
-	local config_path=""
-
-	# Identify the variant - they have their own top-level directories
-	if [[ "$variant" == *"rt"* ]]; then
-		# RT variant - goes under rt/
-		if [[ "$variant" == *"debug"* ]]; then
-			config_path="rt/debug"
-		else
-			config_path="rt/generic"
-		fi
-	elif [[ "$variant" == *"automotive"* ]]; then
-		# Automotive variant - goes under automotive/
-		if [[ "$variant" == *"debug"* ]]; then
-			config_path="automotive/debug"
-		else
-			config_path="automotive/generic"
-		fi
-	else
-		# Stock kernel - goes under top-level debug or generic
-		if [[ "$variant" == *"debug"* ]]; then
-			config_path="debug"
-		else
-			config_path="generic"
-		fi
-	fi
-
-	# Add architecture-specific subdirectories
-	case "$arch" in
-		arm64)
-			config_path="$config_path/arm/aarch64"
-			;;
-		powerpc)
-			config_path="$config_path/powerpc"
-			;;
-		riscv)
-			config_path="$config_path/riscv/riscv64"
-			;;
-		s390)
-			if [[ "$variant" == *"zfcpdump"* ]]; then
-				config_path="$config_path/s390x/zfcpdump"
-			else
-				config_path="$config_path/s390x"
-			fi
-			;;
-		x86_64)
-			config_path="$config_path/x86"
-			;;
-		*)
-			# For unknown architectures, don't add arch subdirectory
-			;;
-	esac
-
-	echo "$config_path"
-}
-
-# Parse mismatched configs found during processing and create
-# individual CONFIG files in the pending directory for each
-parse_mismatched_configs()
-{
-	local tmpdir
-	local count=$1    # Counter for unique filenames
-	local arch=$2
-	local variant=$3
-
-	tmpdir=$(mktemp -d)
-
-	# Parse the mismatches file and create individual CONFIG files
-	tail -n +2 .mismatches"${count}" | while read -r LINE
-	do
-		if echo "$LINE" | grep -q "Found # .* is not set, after generation"; then
-			# Handle case where we found "# CONFIG_FOO is not set" after generation
-			config_name="${LINE#*Found # }"
-			config_name="${config_name% is not set, after generation*}"
-			if [ -n "$config_name" ]; then
-				echo "# Mismatch found in $arch $variant config" > "$tmpdir/$config_name"
-				echo "# $config_name is not set" >> "$tmpdir/$config_name"
-			fi
-		elif echo "$LINE" | grep -q "Found .* after generation"; then
-			# Handle case where we found "CONFIG_FOO=value" after generation
-			config_name="${LINE#*Found }"
-			config_name="${config_name% after generation*}"
-			config_name="${config_name%=*}"
-			config_value="${LINE#*Found }"
-			config_value="${config_value#*=}"
-			config_value="${config_value% after generation*}"
-			if [ -n "$config_name" ] && [ -n "$config_value" ]; then
-				echo "# Mismatch found in $arch $variant config" > "$tmpdir/$config_name"
-				echo "$config_name=$config_value" >> "$tmpdir/$config_name"
-			fi
-		fi
-	done
-
-	# Copy the CONFIG files to the pending directory
-	config_path=$(determine_config_path "$arch" "$variant")
-	mkdir -p "$SCRIPT_DIR/pending-$FLAVOR/$config_path/"
-	for f in "$tmpdir"/*; do
-		[[ -e "$f" ]] || break
-		cp "$f" "$SCRIPT_DIR/pending-$FLAVOR/$config_path/"
-	done
-
-	rm -rf "$tmpdir"
-}
-
-# Check for configuration mismatches between the original and generated configs
 checkoptions()
 {
-	cfg=$1      # Original config file
-	cfgtmp=$2   # Generated config file
-	count=$3    # Counter for unique filenames
-	variant=$4  # Config variant (e.g., debug, rt)
+	count=$3
+	variant=$4
 
-	# This awk script compares configuration files for mismatches
 	/usr/bin/awk '
 
 		/is not set/ {
@@ -208,7 +87,7 @@ checkoptions()
 					 print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
 			}
 		}
-	' "$cfg" "$cfgtmp" > .mismatches"${count}"
+	' "$1" "$2" > .mismatches"${count}"
 
 	checkoptions_error=false
 	if test -s .mismatches"${count}"
@@ -228,18 +107,11 @@ checkoptions()
 		! $checkoptions_error && return
 
 		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}"
-
-		# Add mismatched configs to the pending directory
-		if test -n "$COMMITMISMATCHES"; then
-			parse_mismatched_configs "$count" "$arch" "$variant"
-		fi
 	else
 		rm -f .mismatches"${count}"
 	fi
 }
 
-# Parse the output of 'make listnewconfig' and 'make helpnewconfig'
-# to create properly formatted configuration files for new configs
 parsenewconfigs()
 {
 	tmpdir=$(mktemp -d)
@@ -282,14 +154,12 @@ parsenewconfigs()
                         split($0, a, " ");
                         symbol="CONFIG_"a[2];
                         outfile=BASE "/fake_"symbol
-                        print "# ~~~" >> outfile;
                 }
                 /-----/ {
 			if (inpatch == 0) {
 				inpatch = 1;
 			}
                         else {
-                                print "# ~~~" >> outfile;
                                 if (symbol != "none") {
                                     print "# Commit: "commit >> outfile
                                     system("cat " outfile " " BASE "/" symbol " > " BASE "/tmpf");
@@ -324,32 +194,12 @@ parsenewconfigs()
 	popd &> /dev/null
 	for f in "$tmpdir"/*; do
 		[[ -e "$f" ]] || break
-		cp "$f" "$SCRIPT_DIR/pending-$FLAVOR/generic/"
+		cp "$f" "$SCRIPT_DIR/pending$FLAVOR/generic/"
 	done
 
 	rm -rf "$tmpdir"
 }
 
-# Commit any mismatched configs that were saved to the pending directory
-commit_mismatched_configs()
-{
-	# assume we are in $source_tree/configs, need to get to top level
-	pushd "$(switch_to_toplevel)" &>/dev/null
-
-	# Check if there are any modified or untracked mismatched configs to commit
-	if git status --porcelain "$SCRIPT_DIR/pending-$FLAVOR/" | grep -q .; then
-		echo "Committing mismatched configuration files..."
-		git add "$SCRIPT_DIR/pending-$FLAVOR"
-		git commit -m "[redhat] AUTOMATIC: Mismatched $FLAVOR configs"
-		echo "Mismatched configs committed to pending-$FLAVOR directory"
-	else
-		echo "No mismatched configs found to commit"
-	fi
-
-	popd &>/dev/null
-}
-
-# Processes all config files, finds new/unset configs, and commits them
 function commit_new_configs()
 {
 	# assume we are in $source_tree/configs, need to get to top level
@@ -382,13 +232,10 @@ function commit_new_configs()
 		echo "done"
 	done
 
-	# Commit the new configuration files to git
-	git add "$SCRIPT_DIR/pending-$FLAVOR"
-	# DO NOT CHANGE THIS MESSAGE! gen_config_patches.sh looks for this commit message.
+	git add "$SCRIPT_DIR/pending$FLAVOR"
 	git commit -m "[redhat] AUTOMATIC: New configs"
 }
 
-# Process a single configuration file
 function process_config()
 {
 	local cfg
@@ -458,13 +305,16 @@ function process_config()
 	echo "Processing $cfg complete"
 }
 
-# Process all configuration files
-# Handles parallel processing and error reporting
 function process_configs()
 {
 	# assume we are in $source_tree/configs, need to get to top level
 	pushd "$(switch_to_toplevel)" &>/dev/null
 
+	# The next line is throwaway code for transition to parallel
+	# processing.  Leaving this line in place is harmless, but it can be
+	# removed the next time anyone updates this function.
+	[ -f .mismatches ] && rm -f .mismatches
+
 	count=0
 	for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config
 	do
@@ -490,13 +340,7 @@ function process_configs()
 		cat .errors*
 		rm .errors* -f
 	fi
-
-	# Commit any mismatched configs found during processing
-	if [ $RETURNCODE -eq 0 ] && test -n "$COMMITMISMATCHES"; then
-		rm .mismatches* -f
-		commit_mismatched_configs
-	# Otherwise, display any mismatched configs
-	elif ls .mismatches* 1> /dev/null 2>&1; then
+	if ls .mismatches* 1> /dev/null 2>&1; then
 		RETURNCODE=1
 		cat .mismatches*
 		rm .mismatches* -f
@@ -508,13 +352,11 @@ function process_configs()
 }
 
 CHECKOPTIONS=""
-IGNOREERRORS=""
 NEWOPTIONS=""
 TESTRUN=""
 CHECKWARNINGS=""
 MAKEOPTS=""
 CC_IS_CLANG=0
-COMMITMISMATCHES=""
 
 RETURNCODE=0
 
@@ -523,9 +365,7 @@ do
 	key="$1"
 	case $key in
 		-a)
-			# Enable all error checking options
 			CHECKOPTIONS="x"
-			IGNOREERRORS="x"
 			NEWOPTIONS="x"
 			CHECKWARNINGS="x"
 			;;
@@ -535,9 +375,6 @@ do
 		-h)
 			usage
 			;;
-		-i)
-			IGNOREERRORS="x"
-			;;
 		-n)
 			NEWOPTIONS="x"
 			;;
@@ -552,16 +389,11 @@ do
 			;;
 		-m)
 			shift
-			# Handle clang compiler options
 			if [ "$1" = "CC=clang" ] || [ "$1" = "LLVM=1" ]; then
 				CC_IS_CLANG=1
 			fi
 			MAKEOPTS="$MAKEOPTS $1"
 			;;
-		-M)
-			COMMITMISMATCHES="x"
-			CHECKOPTIONS="x"
-			;;
 		*)
 			break;;
 	esac
@@ -569,11 +401,17 @@ do
 done
 
 KVERREL="$(test -n "$1" && echo "-$1" || echo "")"
-FLAVOR="$(test -n "$2" && echo "$2" || echo "rhel")"
+FLAVOR="$(test -n "$2" && echo "-$2" || echo "-rhel")"
 # shellcheck disable=SC2015
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")
 
+# Config options for RHEL should target the pending-rhel directory, not pending-common.
+if [ "$FLAVOR" = "-rhel" ]
+then
+	FLAVOR="-rhel"
+fi
+
 # to handle this script being a symlink
 cd "$SCRIPT_DIR"
 
@@ -583,8 +421,4 @@ else
 	process_configs
 fi
 
-if test -n "$IGNOREERRORS"; then
-	exit 0
-else
-	exit $RETURNCODE
-fi
+exit $RETURNCODE

rpminspect.yaml

@@ -15,34 +15,17 @@ emptyrpm:
         - kernel-debug
         - kernel-debug-devel-matched
         - kernel-devel-matched
-        - kernel-modules-extra-matched
+        - kernel-lpae
         - kernel-zfcpdump
         - kernel-zfcpdump-devel-matched
         - kernel-zfcpdump-modules
-        - kernel-zfcpdump-modules-partner
-        - kernel-rt
-        - kernel-rt-debug
-        - kernel-rt-debug-devel-matched
-        - kernel-rt-devel-matched
-        - kernel-rt-modules-extra-matched
-        - kernel-64k
-        - kernel-64k-debug
-        - kernel-64k-debug-devel-matched
-        - kernel-64k-devel-matched
-        - kernel-64k-modules-extra-matched
-        - kernel-rt-64k
-        - kernel-rt-64k-debug
-        - kernel-rt-64k-debug-devel-matched
-        - kernel-rt-64k-devel-matched
-        - kernel-rt-64k-modules-extra-matched
 
 patches:
     ignore_list:
         - linux-kernel-test.patch
-        - patch-6.19-redhat.patch
+        - patch-6.11-redhat.patch
 
 runpath:
     ignore:
         - /usr/libexec/kselftests/bpf/urandom_read
         - /usr/libexec/kselftests/bpf/no_alu32/urandom_read
-        - /usr/libexec/kselftests/bpf/cpuv4/urandom_read

sources

@@ -1,3 +1,5 @@
-SHA512 (linux-6.19-rc5.tar.xz) = d61ec1e68ee22b58a0e335e8a349e8c8a3d59219264d6f769d36c50f9a013e4bdf8b39481aa6dee575df62e60841ba687fccb7a82f99b9b005a09008927cb57e
-SHA512 (kernel-abi-stablelists-6.19.0.tar.xz) = 467b85c3bb413e713a2e1500060fe4f4ba6934cc5a28294a5952e4452baecf997e246317b09a34f7bece1daf26a4d4f40a95557ac843ec30d218c854f576516b
-SHA512 (kernel-kabi-dw-6.19.0.tar.xz) = 7a698cf2b133314dcbe1452a16859aa0af35d486af939b6c72b6d3e88692718900c61b79e31052342075fb74ee61581f19a5f8f1bac3e1813737f6336b84efe4
+SHA512 (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

uki-addons.sbat.template

@@ -1,2 +0,0 @@
-sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-kernel-uki-virt-addons.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt-addons,@KVER,mailto:secalert@redhat.com

uki.sbat.template

@@ -1,2 +0,0 @@
-sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-kernel-uki-virt.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt,@KVER,mailto:secalert@redhat.com

uki_addons.json

@@ -1,33 +1,4 @@
 {
-    "common": {
-        "crashkernel-1536M.addon": [
-            "crashkernel=1536M\n"
-        ],
-        "crashkernel-192M.addon": [
-            "crashkernel=192M\n"
-        ],
-        "crashkernel-1G.addon": [
-            "crashkernel=1G\n"
-        ],
-        "crashkernel-256M.addon": [
-            "crashkernel=256M\n"
-        ],
-        "crashkernel-2G.addon": [
-            "crashkernel=2G\n"
-        ],
-        "crashkernel-512M.addon": [
-            "crashkernel=512M\n"
-        ],
-        "crashkernel-default.addon": [
-            "crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M\n"
-        ],
-        "debug.addon": [
-            "debug"
-        ],
-        "systemd-volatile-overlay.addon": [
-            "systemd.volatile=overlay"
-        ]
-    },
     "virt": {
         "common": {
             "fips-disable.addon": [
@@ -36,13 +7,6 @@
             "fips-enable.addon": [
                 "fips=1\n"
             ]
-        },
-        "rhel": {
-            "aarch64": {
-                "crashkernel-default.addon": [
-                    "crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M\n"
-                ]
-            }
         }
     }
 }

uki_create_addons.py

@@ -4,7 +4,7 @@
 # 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 [sbat]
+# Usage: python uki_create_addons.py input_json out_dir uki distro arch
 #
 # This tool requires the systemd-ukify and systemd-boot packages.
 #
@@ -26,6 +26,14 @@
 # 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
@@ -37,7 +45,7 @@ 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 [sbat]')
+    print(f'Usage: {os.path.basename(__file__)} input_json output_dir uki distro arch')
     print(f'Error:{err}')
     sys.exit(1)
 
@@ -54,8 +62,9 @@ def check_clean_arguments(input_json, out_dir):
 UKICmdlineAddon = collections.namedtuple('UKICmdlineAddon', ['name', 'cmdline'])
 uki_addons_list = []
 uki_addons = {}
+addon_sbat_string = None
 
-def parse_lines(lines):
+def parse_lines(lines, rstrip=True):
     cmdline = ''
     for l in lines:
         l = l.lstrip()
@@ -63,17 +72,27 @@ def parse_lines(lines):
             continue
         if l[0] == '#':
             continue
-        cmdline += l.rstrip() + ' '
+        # 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:
@@ -102,21 +121,21 @@ def parse_in_json(in_json, uki_name, distro, arch):
         if cmdline:
             uki_addons_list.append(UKICmdlineAddon(addon_full_name, cmdline))
 
-def create_addons(out_dir, sbat):
+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',
-            '--cmdline', uki_addon.cmdline,
-            '--output', out_path]
-        if sbat:
-            cmd.extend(['--sbat', sbat.rstrip()])
+            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 or argc > 6:
+    if argc != 5:
         usage('too few or too many parameters!')
 
     input_json = sys.argv[1]
@@ -125,12 +144,8 @@ if __name__ == "__main__":
     distro = sys.argv[4]
     arch = sys.argv[5]
 
-    custom_sbat = None
-    if argc == 6:
-        custom_sbat = sys.argv[6]
-
     out_dir = check_clean_arguments(input_json, out_dir)
     parse_in_json(input_json, uki_name, distro, arch)
-    create_addons(out_dir, custom_sbat)
+    create_addons(out_dir)