kernel-6.17.10-100

* Mon Dec 01 2025 Augusto Caringi <acaringi@redhat.com> [6.17.10-0] - Revert "gpio: swnode: don't use the swnode's name as the key for GPIO lookup" (Justin M. Forbes) - Linux v6.17.10 Resolves: Signed-off-by: Augusto Caringi <acaringi@redhat.com>
kernel-6.17.9-100
2025-12-01 11:34:27 -03:00 · 2025-11-24 18:08:01 -03:00 · 2025-11-13 22:26:27 -03:00 · 2025-11-02 08:21:06 -07:00 · 2025-10-29 15:37:03 -03:00 · 2025-10-23 09:06:23 -06:00
62 changed files with 141134 additions and 11938 deletions
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@ -1,4 +1,4 @@
-RHEL_MAJOR = 9
+RHEL_MAJOR = 10
 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 = 63
+RHEL_RELEASE = 0

 #
 # RHEL_REBASE_NUM
@ -78,3 +78,13 @@ ifneq ("$(ZSTREAM)", "yes")
    RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
  endif
 endif
+
+#
+# Automotive
+# ----------
+#
+# Represents the major and minor release used by automotive.
+# Primarily this is used to to identify the build target when
+# building the kernel-automotive packages.
+AUTOMOTIVE_MAJOR = 2
+AUTOMOTIVE_MINOR = 99
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,435 +1,231 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/3c3fe7f3d440e344ba33049fa99d14eb6172224b
- 3c3fe7f3d440e344ba33049fa99d14eb6172224b redhat: include resolve_btfids in kernel-devel
+https://gitlab.com/cki-project/kernel-ark/-/commit/bddaba0f55a560c71fb245c91ae01ac34cdbba25
+ bddaba0f55a560c71fb245c91ae01ac34cdbba25 Revert "gpio: swnode: don't use the swnode's name as the key for GPIO lookup"

-https://gitlab.com/cki-project/kernel-ark/-/commit/8b553d8591d86f4a768f3b55f99f8480872cb823
- 8b553d8591d86f4a768f3b55f99f8480872cb823 redhat: workaround CKI cross compilation for scripts
+https://gitlab.com/cki-project/kernel-ark/-/commit/15aa65f5bd407e8871f9fa676908dcc255361486
+ 15aa65f5bd407e8871f9fa676908dcc255361486 rust: kbuild: workaround `rustdoc` doctests modifier bug

-https://gitlab.com/cki-project/kernel-ark/-/commit/b0c8e7622950ce4bd430980be9a93e56bda43672
- b0c8e7622950ce4bd430980be9a93e56bda43672 crypto: akcipher - Disable signing and decryption
+https://gitlab.com/cki-project/kernel-ark/-/commit/27852f88206cc41633537ea3d31f8c13f086f4e1
+ 27852f88206cc41633537ea3d31f8c13f086f4e1 rust: kbuild: treat `build_error` and `rustdoc` as kernel objects

-https://gitlab.com/cki-project/kernel-ark/-/commit/a09122a7a65c8e9f1a0982f6a9c768bf040f6df9
- a09122a7a65c8e9f1a0982f6a9c768bf040f6df9 crypto: dh - implement FIPS PCT
+https://gitlab.com/cki-project/kernel-ark/-/commit/60f834d904d08e241f1e68ef5aa59e0c784dec64
+ 60f834d904d08e241f1e68ef5aa59e0c784dec64 PCI: vmd: override irq_startup()/irq_shutdown() in vmd_init_dev_msi_info()

-https://gitlab.com/cki-project/kernel-ark/-/commit/a9c9a82dfe33e40861d7d0a13ae9fe50a5b49c12
- a9c9a82dfe33e40861d7d0a13ae9fe50a5b49c12 crypto: ecdh - disallow plain "ecdh" usage in FIPS mode
+https://gitlab.com/cki-project/kernel-ark/-/commit/3060ed02f4a7e09f9b583b21cd79990b9be01e04
+ 3060ed02f4a7e09f9b583b21cd79990b9be01e04 gpio: usbio: Add ACPI device-id for MTL-CVF devices

-https://gitlab.com/cki-project/kernel-ark/-/commit/135f5f0257aaf5fc358eb35665b88f78cfa9882d
- 135f5f0257aaf5fc358eb35665b88f78cfa9882d crypto: seqiv - flag instantiations as FIPS compliant
+https://gitlab.com/cki-project/kernel-ark/-/commit/30a281e3b63d9a5134e4ed42a19dd8b440022538
+ 30a281e3b63d9a5134e4ed42a19dd8b440022538 i2c: usbio: Add ACPI device-id for MTL-CVF devices

-https://gitlab.com/cki-project/kernel-ark/-/commit/6425c2e128af3870617dd29da8110e7fa17b9ba9
- 6425c2e128af3870617dd29da8110e7fa17b9ba9 not upstream: Disable vdso getrandom when FIPS is enabled
+https://gitlab.com/cki-project/kernel-ark/-/commit/1748701ccf977943c2977fde3ed74353b5496a4c
+ 1748701ccf977943c2977fde3ed74353b5496a4c wifi: ath11k: Add missing platform IDs for quirk table

-https://gitlab.com/cki-project/kernel-ark/-/commit/ecb1311a2f2e5baf8cd394850d03d33e18c8ba41
- ecb1311a2f2e5baf8cd394850d03d33e18c8ba41 [kernel] bpf: set default value for bpf_jit_harden
+https://gitlab.com/cki-project/kernel-ark/-/commit/66d6e49f25d39fcdb49308c1d7775907621b5245
+ 66d6e49f25d39fcdb49308c1d7775907621b5245 blk-mq: fix blk_mq_tags double free while nr_requests grown

-https://gitlab.com/cki-project/kernel-ark/-/commit/6ae23a2899f457adcbd4e081dec7a49a62b5ec87
- 6ae23a2899f457adcbd4e081dec7a49a62b5ec87 Add support to rh_waived cmdline boot parameter
+https://gitlab.com/cki-project/kernel-ark/-/commit/5fa16f2c7c24a728beccde52592c57719ec41fca
+ 5fa16f2c7c24a728beccde52592c57719ec41fca usb: typec: ucsi: Handle incorrect num_connectors capability

-https://gitlab.com/cki-project/kernel-ark/-/commit/ea1b0021eef49f13c5a0ccf1e2e1e506a9992250
- ea1b0021eef49f13c5a0ccf1e2e1e506a9992250 rh_flags: fix failed when register_sysctl_sz rh_flags_table to kernel
+https://gitlab.com/cki-project/kernel-ark/-/commit/f94928cb3bf1f38192245cc0fb121e93231b7dd0
+ f94928cb3bf1f38192245cc0fb121e93231b7dd0 arm64: dts: qcom: x1e80100-lenovo-yoga-slim7x: add Bluetooth support

-https://gitlab.com/cki-project/kernel-ark/-/commit/38fda603cbe1d8e6158f027bcf5119813f4043b3
- 38fda603cbe1d8e6158f027bcf5119813f4043b3 [redhat] rh_flags: constify the ctl_table argument of proc_handler
+https://gitlab.com/cki-project/kernel-ark/-/commit/8954d31d6b48c0de1774fabca2b68f4a8f9fcd58
+ 8954d31d6b48c0de1774fabca2b68f4a8f9fcd58 i2c: Add Intel USBIO I2C driver

-https://gitlab.com/cki-project/kernel-ark/-/commit/6fd960759f97a5d7638604bf050268d3019d079d
- 6fd960759f97a5d7638604bf050268d3019d079d redhat: rh_flags: declare proper static methods when !CONFIG_RHEL_DIFFERENCES
+https://gitlab.com/cki-project/kernel-ark/-/commit/8323915b4b7178aa54c343eef4b8ac2500de0326
+ 8323915b4b7178aa54c343eef4b8ac2500de0326 gpio: Add Intel USBIO GPIO driver

-https://gitlab.com/cki-project/kernel-ark/-/commit/e17bacfa75053db9c6d53889a7bbcacf2dc792fa
- e17bacfa75053db9c6d53889a7bbcacf2dc792fa not upstream: drop openssl ENGINE API usage
+https://gitlab.com/cki-project/kernel-ark/-/commit/bd32ba7b2550a6a4cc4706301f600c7240f3a05a
+ bd32ba7b2550a6a4cc4706301f600c7240f3a05a usb: misc: Add Intel USBIO bridge driver

-https://gitlab.com/cki-project/kernel-ark/-/commit/1dac14d8c6c96cf0d5482ae5058a0d5a9168a658
- 1dac14d8c6c96cf0d5482ae5058a0d5a9168a658 media: ipu-bridge: Add HIDs from out of tree IPU6 driver ipu-bridge copy
+https://gitlab.com/cki-project/kernel-ark/-/commit/fb3c43460df4d29e164c82554277b4903998db6f
+ fb3c43460df4d29e164c82554277b4903998db6f media: ov08x40: Fix the horizontal flip control

-https://gitlab.com/cki-project/kernel-ark/-/commit/4cb78cb3abf1fe71466080bfaab5f2d235346ff3
- 4cb78cb3abf1fe71466080bfaab5f2d235346ff3 media: ipu-bridge: Sort ipu_supported_sensors[] array by ACPI HID
+https://gitlab.com/cki-project/kernel-ark/-/commit/f113a746dccad5e407fdf9a1b49c85e7a5b99c3a
+ f113a746dccad5e407fdf9a1b49c85e7a5b99c3a ACPI: scan: Add Intel CVS ACPI HIDs to acpi_ignore_dep_ids[]

-https://gitlab.com/cki-project/kernel-ark/-/commit/1135086f19f762f7d488a88bd340dd9b2025bda1
- 1135086f19f762f7d488a88bd340dd9b2025bda1 redhat: make bnx2xx drivers unmaintained in rhel-10
+https://gitlab.com/cki-project/kernel-ark/-/commit/8ecfdac68955cc7ef306e763c4701e7abeac8543
+ 8ecfdac68955cc7ef306e763c4701e7abeac8543 platform/x86: int3472: Increase ov08x40 handshake GPIO delay to 45 ms

-https://gitlab.com/cki-project/kernel-ark/-/commit/afa4fe68597f6ffc6e42e14cc07140de86be94c9
- afa4fe68597f6ffc6e42e14cc07140de86be94c9 rh_flags: Rename rh_features to rh_flags
+https://gitlab.com/cki-project/kernel-ark/-/commit/32725c6665f45b8f45b7caa4c97c0594bcdd0393
+ 32725c6665f45b8f45b7caa4c97c0594bcdd0393 platform/x86: int3472: Rework regulator enable-time handling

-https://gitlab.com/cki-project/kernel-ark/-/commit/5dcb5dbc042a90d7db565097011d4c484fc9ac37
- 5dcb5dbc042a90d7db565097011d4c484fc9ac37 kernel: rh_features: fix reading empty feature list from /proc
+https://gitlab.com/cki-project/kernel-ark/-/commit/006fd67c0b3e91f86f1449f792d7d40998c37d4f
+ 006fd67c0b3e91f86f1449f792d7d40998c37d4f platform/x86: int3472: Convert int3472_gpio_map to use C99 initializers

-https://gitlab.com/cki-project/kernel-ark/-/commit/c202035d59c34a262d5118ffdf050ac7447fb962
- c202035d59c34a262d5118ffdf050ac7447fb962 rh_features: move rh_features entry to sys/kernel
+https://gitlab.com/cki-project/kernel-ark/-/commit/03b1f9503b74fb11ff8797c1b73d63fc463a1c2d
+ 03b1f9503b74fb11ff8797c1b73d63fc463a1c2d powerpc/tools: drop `-o pipefail` in gcc check scripts

-https://gitlab.com/cki-project/kernel-ark/-/commit/16e99d54bb828c9eb4b0b57768ce79242b74a348
- 16e99d54bb828c9eb4b0b57768ce79242b74a348 rh_features: convert to atomic allocation
+https://gitlab.com/cki-project/kernel-ark/-/commit/17e842dc3cbf9a2cbd4330399ebd140a5f3555b0
+ 17e842dc3cbf9a2cbd4330399ebd140a5f3555b0 KVM/TDX: Explicitly do WBINVD when no more TDX SEAMCALLs

-https://gitlab.com/cki-project/kernel-ark/-/commit/7315ec7f71bc1599b029ffae4e2a552e9c023d32
- 7315ec7f71bc1599b029ffae4e2a552e9c023d32 add rh_features to /proc
+https://gitlab.com/cki-project/kernel-ark/-/commit/baa38bd2a561cf7b9bc0fdfd0891365739924948
+ baa38bd2a561cf7b9bc0fdfd0891365739924948 x86/virt/tdx: Update the kexec section in the TDX documentation

-https://gitlab.com/cki-project/kernel-ark/-/commit/21299dacb012c66bbc4defe87a3faf2d6ef1b75f
- 21299dacb012c66bbc4defe87a3faf2d6ef1b75f add support for rh_features
+https://gitlab.com/cki-project/kernel-ark/-/commit/980036ebf5da4e026d4c24c910b37c0be3350a5c
+ 980036ebf5da4e026d4c24c910b37c0be3350a5c x86/virt/tdx: Remove the !KEXEC_CORE dependency

-https://gitlab.com/cki-project/kernel-ark/-/commit/e9fde71eb980d49c9b876604529cf44f2d0ea748
- e9fde71eb980d49c9b876604529cf44f2d0ea748 [redhat] PCI: Fix pci_rh_check_status() call semantics
+https://gitlab.com/cki-project/kernel-ark/-/commit/81222db814cab5bcd6f090482f025d2c94163706
+ 81222db814cab5bcd6f090482f025d2c94163706 x86/kexec: Disable kexec/kdump on platforms with TDX partial write erratum

-https://gitlab.com/cki-project/kernel-ark/-/commit/632956bf1b0e79933a0699d2fcdf643a2ff9ba98
- 632956bf1b0e79933a0699d2fcdf643a2ff9ba98 scsi: sd: condition probe_type under RHEL_DIFFERENCES
+https://gitlab.com/cki-project/kernel-ark/-/commit/22da7dcaeafc05f8bc775e5ce2713f1554538ada
+ 22da7dcaeafc05f8bc775e5ce2713f1554538ada x86/virt/tdx: Mark memory cache state incoherent when making SEAMCALL

-https://gitlab.com/cki-project/kernel-ark/-/commit/562ec649489202ef85643f9f9ba841b25e5075a2
- 562ec649489202ef85643f9f9ba841b25e5075a2 scsi: sd: remove unused sd_probe_types
+https://gitlab.com/cki-project/kernel-ark/-/commit/6f806f83a781d96bf847565da401c20d1895243e
+ 6f806f83a781d96bf847565da401c20d1895243e x86/sme: Use percpu boolean to control WBINVD during kexec

-https://gitlab.com/cki-project/kernel-ark/-/commit/3fb78807aaa5b028cab9a996e85a79857c901b31
- 3fb78807aaa5b028cab9a996e85a79857c901b31 [redhat] rh_messages.h: mark mlx5 on Bluefield-3 as unmaintained
+https://gitlab.com/cki-project/kernel-ark/-/commit/ee4f8c1c52d602cec787f7d9244f040868f1f771
+ ee4f8c1c52d602cec787f7d9244f040868f1f771 x86/kexec: Consolidate relocate_kernel() function parameters

-https://gitlab.com/cki-project/kernel-ark/-/commit/247defdf31d28a812a2c06c345d598ba34660559
- 247defdf31d28a812a2c06c345d598ba34660559 [redhat] rh_messages.h: initial driver and device lists
+https://gitlab.com/cki-project/kernel-ark/-/commit/ac733ae45f49b68213b54beee5aeb78d7d990571
+ ac733ae45f49b68213b54beee5aeb78d7d990571 arm64: add early lockdown for secure boot

-https://gitlab.com/cki-project/kernel-ark/-/commit/2fd98b58fbd8495418edb8115f29e747ff6b7ef8
- 2fd98b58fbd8495418edb8115f29e747ff6b7ef8 arch/x86: Fix XSAVE check for x86_64-v2 check
+https://gitlab.com/cki-project/kernel-ark/-/commit/bf258421f5e712014c5a6214719be6e417313495
+ bf258421f5e712014c5a6214719be6e417313495 efi: pass secure boot mode to kernel proper

-https://gitlab.com/cki-project/kernel-ark/-/commit/4a1d665621d643c55a3cf6630ec5ea43579019a0
- 4a1d665621d643c55a3cf6630ec5ea43579019a0 arch/x86/kernel/setup.c: fixup rh_check_supported
+https://gitlab.com/cki-project/kernel-ark/-/commit/d2a7febf0f7a1ba8e025df899d437d2808d26467
+ d2a7febf0f7a1ba8e025df899d437d2808d26467 selftests/bpf: Remove ksyms_weak_lskel test

-https://gitlab.com/cki-project/kernel-ark/-/commit/898831969d6533bc59caf962d687a767894a25e1
- 898831969d6533bc59caf962d687a767894a25e1 lsm: update security_lock_kernel_down
+https://gitlab.com/cki-project/kernel-ark/-/commit/affe1cba89fa2c5486c6eff5e00a10e0dbad311f
+ affe1cba89fa2c5486c6eff5e00a10e0dbad311f Simplify include Makefile.rhelver

-https://gitlab.com/cki-project/kernel-ark/-/commit/08c8933b07e21e2e5d5fcccde47fa235f8600428
- 08c8933b07e21e2e5d5fcccde47fa235f8600428 arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated
+https://gitlab.com/cki-project/kernel-ark/-/commit/516486e06fa39077bec3897c82e51fc64ac4fc88
+ 516486e06fa39077bec3897c82e51fc64ac4fc88 redhat: make ENABLE_WERROR also enable OBJTOOL_WERROR

-https://gitlab.com/cki-project/kernel-ark/-/commit/6554e12af642c1a7a39be5d6d403879072fa949e
- 6554e12af642c1a7a39be5d6d403879072fa949e redhat: kABI: add missing RH_KABI_SIZE_ALIGN_CHECKS Kconfig option
+https://gitlab.com/cki-project/kernel-ark/-/commit/337131145494de0c66bcb9e0789eceabd2d4c021
+ 337131145494de0c66bcb9e0789eceabd2d4c021 efi,lockdown: fix kernel lockdown on Secure Boot

-https://gitlab.com/cki-project/kernel-ark/-/commit/63dd10f139d9f2de8cfdd5b403227dd367cdaad6
- 63dd10f139d9f2de8cfdd5b403227dd367cdaad6 redhat: rh_kabi: introduce RH_KABI_EXCLUDE_WITH_SIZE
+https://gitlab.com/cki-project/kernel-ark/-/commit/d8ea037646cccaecc8686ca63d2207c77a98738d
+ d8ea037646cccaecc8686ca63d2207c77a98738d Revert "nvme: Return BLK_STS_TARGET if the DNR bit is set"

-https://gitlab.com/cki-project/kernel-ark/-/commit/3eef142590c81d3756bbb78133002252e43fda24
- 3eef142590c81d3756bbb78133002252e43fda24 redhat: rh_kabi: move semicolon inside __RH_KABI_CHECK_SIZE
+https://gitlab.com/cki-project/kernel-ark/-/commit/1cd159e79b1f0ade555a16e3af50a565bdc676c2
+ 1cd159e79b1f0ade555a16e3af50a565bdc676c2 Revert "nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT"

-https://gitlab.com/cki-project/kernel-ark/-/commit/f332651ae449dde7ef713a3af6ff2112d68adbc3
- f332651ae449dde7ef713a3af6ff2112d68adbc3 random: replace import_single_range() with import_ubuf()
+https://gitlab.com/cki-project/kernel-ark/-/commit/d88405cfbdc19daaff9f492ccfc0510610ad2fee
+ d88405cfbdc19daaff9f492ccfc0510610ad2fee Revert "nvme: decouple basic ANA log page re-read support from native multipathing"

-https://gitlab.com/cki-project/kernel-ark/-/commit/02c431df779a3612582b60c07d073b21e307a613
- 02c431df779a3612582b60c07d073b21e307a613 ext4: Mark mounting fs-verity filesystems as tech-preview
+https://gitlab.com/cki-project/kernel-ark/-/commit/0dde1b004c9e361759c8929c5ad3f885fb435169
+ 0dde1b004c9e361759c8929c5ad3f885fb435169 Revert "nvme: nvme_mpath_init remove multipath check"

-https://gitlab.com/cki-project/kernel-ark/-/commit/1c7d1a6006848b648211902bb34b366f04288a30
- 1c7d1a6006848b648211902bb34b366f04288a30 erofs: Add tech preview markers at mount
+https://gitlab.com/cki-project/kernel-ark/-/commit/f2103d30ac861602d6177018ff601e2505176ef0
+ f2103d30ac861602d6177018ff601e2505176ef0 redhat: fix modules.order target

-https://gitlab.com/cki-project/kernel-ark/-/commit/bd3730207935f6fbb1e29a4e2ede2eec769b3e79
- bd3730207935f6fbb1e29a4e2ede2eec769b3e79 kernel/rh_messages.c: Mark functions as possibly unused
+https://gitlab.com/cki-project/kernel-ark/-/commit/108805ef9b2bb9805ae67f158533f16a1669dc50
+ 108805ef9b2bb9805ae67f158533f16a1669dc50 crypto: sig - Disable signing

-https://gitlab.com/cki-project/kernel-ark/-/commit/03167967737351af015b35c4fd969b3059a582ba
- 03167967737351af015b35c4fd969b3059a582ba crypto: rng - Override drivers/char/random in FIPS mode
+https://gitlab.com/cki-project/kernel-ark/-/commit/c56137b53b6503d07cebb1d8bc9e8a31a4ee36ef
+ c56137b53b6503d07cebb1d8bc9e8a31a4ee36ef redhat: include resolve_btfids in kernel-devel

-https://gitlab.com/cki-project/kernel-ark/-/commit/381550fdd51b6169a3254c36b4a0f4ead5fed835
- 381550fdd51b6169a3254c36b4a0f4ead5fed835 random: Add hook to override device reads and getrandom(2)
+https://gitlab.com/cki-project/kernel-ark/-/commit/2b6df4e0fd080c3a78e592270cab18488117f4a8
+ 2b6df4e0fd080c3a78e592270cab18488117f4a8 redhat: workaround CKI cross compilation for scripts

-https://gitlab.com/cki-project/kernel-ark/-/commit/53889d92471c360bed2107dec29ffa6321f5532c
- 53889d92471c360bed2107dec29ffa6321f5532c [redhat] kernel/rh_messages.c: move hardware tables to rh_messages.h
+https://gitlab.com/cki-project/kernel-ark/-/commit/d1018d6b874da995a1a8320993ab26f21f153ff2
+ d1018d6b874da995a1a8320993ab26f21f153ff2 lsm: update security_lock_kernel_down

-https://gitlab.com/cki-project/kernel-ark/-/commit/1feeeb123b43284d736bbab01145234a9f30b53e
- 1feeeb123b43284d736bbab01145234a9f30b53e [redhat] kernel/rh_messages.c: Wire up new calls
+https://gitlab.com/cki-project/kernel-ark/-/commit/6080cd676715c94c25104b4e5f86a0cf767429a9
+ 6080cd676715c94c25104b4e5f86a0cf767429a9 scsi: sd: Add "probe_type" module parameter to allow synchronous probing

-https://gitlab.com/cki-project/kernel-ark/-/commit/cc004b560a61d1ad214c37e1886584630ac5af47
- cc004b560a61d1ad214c37e1886584630ac5af47 [redhat] drivers/pci: Update rh_messages.c
+https://gitlab.com/cki-project/kernel-ark/-/commit/da1af550cd6429eda32d8c2d863329d65a3fb718
+ da1af550cd6429eda32d8c2d863329d65a3fb718 Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"

-https://gitlab.com/cki-project/kernel-ark/-/commit/ca2d817f82aef988c7e44d1419f27291c7fa0154
- ca2d817f82aef988c7e44d1419f27291c7fa0154 [redhat] drivers/message/fusion/mptspi.c: Remove extra disabled warning
+https://gitlab.com/cki-project/kernel-ark/-/commit/9cd27a31327253313bc35860382bc9b04bafd391
+ 9cd27a31327253313bc35860382bc9b04bafd391 Enable IO_URING for RHEL

-https://gitlab.com/cki-project/kernel-ark/-/commit/bf5033ee71a5dd338c391ebd30a4a0e02ce2078f
- bf5033ee71a5dd338c391ebd30a4a0e02ce2078f [redhat] mptsas: Remove add_taint()
+https://gitlab.com/cki-project/kernel-ark/-/commit/32ac61b0a65bf21002124db8dd503df4fb57d744
+ 32ac61b0a65bf21002124db8dd503df4fb57d744 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64

-https://gitlab.com/cki-project/kernel-ark/-/commit/0f4a6e957dedd8b530306670c04a4ca3cef604f8
- 0f4a6e957dedd8b530306670c04a4ca3cef604f8 [redhat] drivers/pci: Remove RHEL-only pci_hw_*() functions
+https://gitlab.com/cki-project/kernel-ark/-/commit/2fabed3831d5efebb38e21cbf403741ec737b00d
+ 2fabed3831d5efebb38e21cbf403741ec737b00d redhat: version two of Makefile.rhelver tweaks

-https://gitlab.com/cki-project/kernel-ark/-/commit/53dc07e90a25f430591b387115d2dc2d8e82b1ae
- 53dc07e90a25f430591b387115d2dc2d8e82b1ae scsi: sd: Add "probe_type" module parameter to allow synchronous probing
+https://gitlab.com/cki-project/kernel-ark/-/commit/d251ba15727a10fb5de801704e9c00e5fe1b9272
+ d251ba15727a10fb5de801704e9c00e5fe1b9272 redhat:  adapt to upstream Makefile change

-https://gitlab.com/cki-project/kernel-ark/-/commit/1a98f44cdb4c60efe941aed94c245706ee12e0b4
- 1a98f44cdb4c60efe941aed94c245706ee12e0b4 Revert "Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64"
+https://gitlab.com/cki-project/kernel-ark/-/commit/b0af95bc5a81caf5462d60e6e960495b0205d0a1
+ b0af95bc5a81caf5462d60e6e960495b0205d0a1 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev

-https://gitlab.com/cki-project/kernel-ark/-/commit/a8088cac553d40c338581a157c81d2511d1cdbb0
- a8088cac553d40c338581a157c81d2511d1cdbb0 kernel/rh_messages.c: Another gcc12 warning on redundant NULL test
+https://gitlab.com/cki-project/kernel-ark/-/commit/07143d8185759b6799ccceec9458fae29228fba1
+ 07143d8185759b6799ccceec9458fae29228fba1 RHEL: disable io_uring support

-https://gitlab.com/cki-project/kernel-ark/-/commit/3507a07c14a420df6b731f3de8cabf6879afc89d
- 3507a07c14a420df6b731f3de8cabf6879afc89d Enable IO_URING for RHEL
+https://gitlab.com/cki-project/kernel-ark/-/commit/633a1cff9e670907319a91b83157ac1b4f6ba8e9
+ 633a1cff9e670907319a91b83157ac1b4f6ba8e9 nvme: nvme_mpath_init remove multipath check

-https://gitlab.com/cki-project/kernel-ark/-/commit/295c82a35a0d8c093e8b4f7ac7fecf8b74a18ba2
- 295c82a35a0d8c093e8b4f7ac7fecf8b74a18ba2 Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64
+https://gitlab.com/cki-project/kernel-ark/-/commit/446ae3f6adcad61c20b78a4728ff5b6c537ad832
+ 446ae3f6adcad61c20b78a4728ff5b6c537ad832 nvme: decouple basic ANA log page re-read support from native multipathing

-https://gitlab.com/cki-project/kernel-ark/-/commit/101a818a6ff5a5a876c2a1ffb313b28c1aba1c92
- 101a818a6ff5a5a876c2a1ffb313b28c1aba1c92 redhat: version two of Makefile.rhelver tweaks
+https://gitlab.com/cki-project/kernel-ark/-/commit/77545253929f829bdfd4134c24dfedb1c1b43517
+ 77545253929f829bdfd4134c24dfedb1c1b43517 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT

-https://gitlab.com/cki-project/kernel-ark/-/commit/04e16e6d356cc15a19728b5701b7913ac401b848
- 04e16e6d356cc15a19728b5701b7913ac401b848 redhat:  adapt to upstream Makefile change
+https://gitlab.com/cki-project/kernel-ark/-/commit/e96249802112b759a4a05336b624cdd65c0d51b3
+ e96249802112b759a4a05336b624cdd65c0d51b3 nvme: Return BLK_STS_TARGET if the DNR bit is set

-https://gitlab.com/cki-project/kernel-ark/-/commit/860d12ce801ce7351121fa7193d8dd22d421fd09
- 860d12ce801ce7351121fa7193d8dd22d421fd09 kernel/rh_messages.c: gcc12 warning on redundant NULL test
+https://gitlab.com/cki-project/kernel-ark/-/commit/b15d4421293a8f25e64e59c3d2a6e345df70064e
+ b15d4421293a8f25e64e59c3d2a6e345df70064e REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70

-https://gitlab.com/cki-project/kernel-ark/-/commit/fc12efd33e8faab4cc0d761722c9e32025e969d6
- fc12efd33e8faab4cc0d761722c9e32025e969d6 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
+https://gitlab.com/cki-project/kernel-ark/-/commit/039918d182c9eb19746c88f998abdc89cd264a1d
+ 039918d182c9eb19746c88f998abdc89cd264a1d KEYS: Make use of platform keyring for module signature verify

-https://gitlab.com/cki-project/kernel-ark/-/commit/aa2eb0684a5f5d4868974d47946086b12563a572
- aa2eb0684a5f5d4868974d47946086b12563a572 ARK: Remove code marking devices unmaintained
+https://gitlab.com/cki-project/kernel-ark/-/commit/f1535bd03f8945d80d3b15ee2f8aaee1cf9d8135
+ f1535bd03f8945d80d3b15ee2f8aaee1cf9d8135 Input: rmi4 - remove the need for artificial IRQ in case of HID

-https://gitlab.com/cki-project/kernel-ark/-/commit/ae449ae283f3c375a1abe974194234df52afe979
- ae449ae283f3c375a1abe974194234df52afe979 rh_message: Fix function name
+https://gitlab.com/cki-project/kernel-ark/-/commit/538b2b0521951d0dfcc40a2affcc1e0d985e235b
+ 538b2b0521951d0dfcc40a2affcc1e0d985e235b ARM: tegra: usb no reset

-https://gitlab.com/cki-project/kernel-ark/-/commit/beb6037be7c79ce0cd095023b5bf838a95d24403
- beb6037be7c79ce0cd095023b5bf838a95d24403 Add Partner Supported taint flag to kAFS
+https://gitlab.com/cki-project/kernel-ark/-/commit/88bcbcb914cf0e2af2541532d0c1e4cc2a82ff18
+ 88bcbcb914cf0e2af2541532d0c1e4cc2a82ff18 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT

-https://gitlab.com/cki-project/kernel-ark/-/commit/167f33904cce0aa46c2ecaea673ee96e4f23aa13
- 167f33904cce0aa46c2ecaea673ee96e4f23aa13 Add Partner Supported taint flag
+https://gitlab.com/cki-project/kernel-ark/-/commit/806e746c3fea0a9053f83fb51e6516e5d268056d
+ 806e746c3fea0a9053f83fb51e6516e5d268056d s390: Lock down the kernel when the IPL secure flag is set

-https://gitlab.com/cki-project/kernel-ark/-/commit/194f657bbd039a4565a3561dbb5f4d7f739f3446
- 194f657bbd039a4565a3561dbb5f4d7f739f3446 kabi: Add kABI macros for enum type
+https://gitlab.com/cki-project/kernel-ark/-/commit/9f9c71931408d3fe56980fbccc42b7d7c5592535
+ 9f9c71931408d3fe56980fbccc42b7d7c5592535 efi: Lock down the kernel if booted in secure boot mode

-https://gitlab.com/cki-project/kernel-ark/-/commit/07e38e5a006a36f21355d55e3e1d00669941e6d7
- 07e38e5a006a36f21355d55e3e1d00669941e6d7 kabi: expand and clarify documentation of aux structs
+https://gitlab.com/cki-project/kernel-ark/-/commit/87a8faef27b26fe4c0c759f216afb767b69920d4
+ 87a8faef27b26fe4c0c759f216afb767b69920d4 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode

-https://gitlab.com/cki-project/kernel-ark/-/commit/126854602f366a6fa1be19671b774e62b91aa199
- 126854602f366a6fa1be19671b774e62b91aa199 kabi: introduce RH_KABI_USE_AUX_PTR
+https://gitlab.com/cki-project/kernel-ark/-/commit/17e28f2b15a69893488590ac6d2b8b253c1896f5
+ 17e28f2b15a69893488590ac6d2b8b253c1896f5 security: lockdown: expose a hook to lock the kernel down

-https://gitlab.com/cki-project/kernel-ark/-/commit/ffc00f86daa6948d1b5d1ba9400c93dde668e6bb
- ffc00f86daa6948d1b5d1ba9400c93dde668e6bb kabi: rename RH_KABI_SIZE_AND_EXTEND to AUX
+https://gitlab.com/cki-project/kernel-ark/-/commit/caa7c19ee9a67a4fce23029ed3a2a05b0cfbe155
+ caa7c19ee9a67a4fce23029ed3a2a05b0cfbe155 Make get_cert_list() use efi_status_to_str() to print error messages.

-https://gitlab.com/cki-project/kernel-ark/-/commit/3c210b281e11ad2e7af0c9e282e0e990bd9017b7
- 3c210b281e11ad2e7af0c9e282e0e990bd9017b7 kabi: more consistent _RH_KABI_SIZE_AND_EXTEND
+https://gitlab.com/cki-project/kernel-ark/-/commit/25211acb46231999995eb26be43f26c1ad8b199c
+ 25211acb46231999995eb26be43f26c1ad8b199c Add efi_status_to_str() and rework efi_status_to_err().

-https://gitlab.com/cki-project/kernel-ark/-/commit/ab09b6b4b2e15a32868f5e2d18dce4f0663fd03c
- ab09b6b4b2e15a32868f5e2d18dce4f0663fd03c kabi: use fixed field name for extended part
+https://gitlab.com/cki-project/kernel-ark/-/commit/cbc1c1d46e6e201971dd007b5fbd52935b9123e0
+ cbc1c1d46e6e201971dd007b5fbd52935b9123e0 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT

-https://gitlab.com/cki-project/kernel-ark/-/commit/9c96a259e4c6786c85b87591c15570b1c75f8f15
- 9c96a259e4c6786c85b87591c15570b1c75f8f15 kabi: fix dereference in RH_KABI_CHECK_EXT
+https://gitlab.com/cki-project/kernel-ark/-/commit/942214631215ee739fca56b37b5aa56309827e0a
+ 942214631215ee739fca56b37b5aa56309827e0a iommu/arm-smmu: workaround DMA mode issues

-https://gitlab.com/cki-project/kernel-ark/-/commit/822eb1759bfa8745f653a03ffc7a835f10bab8b1
- 822eb1759bfa8745f653a03ffc7a835f10bab8b1 kabi: fix RH_KABI_SET_SIZE macro
+https://gitlab.com/cki-project/kernel-ark/-/commit/42decf409387a77c6349fc24e9e35e8c0e154b88
+ 42decf409387a77c6349fc24e9e35e8c0e154b88 ipmi: do not configure ipmi for HPE m400

-https://gitlab.com/cki-project/kernel-ark/-/commit/6b1ee1192e73019c4b4754d9afef05a1b8fb2436
- 6b1ee1192e73019c4b4754d9afef05a1b8fb2436 kabi: expand and clarify documentation
+https://gitlab.com/cki-project/kernel-ark/-/commit/d272bdccff6328ee5c6d96f280d08a8b53772677
+ d272bdccff6328ee5c6d96f280d08a8b53772677 ahci: thunderx2: Fix for errata that affects stop engine

-https://gitlab.com/cki-project/kernel-ark/-/commit/90b0593b26429afeb7dafab0487497cc444f9554
- 90b0593b26429afeb7dafab0487497cc444f9554 kabi: make RH_KABI_USE replace any number of reserved fields
+https://gitlab.com/cki-project/kernel-ark/-/commit/81c9e509262a859135c56b911b43940880ef5496
+ 81c9e509262a859135c56b911b43940880ef5496 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon

-https://gitlab.com/cki-project/kernel-ark/-/commit/d791a7abb593b9da3737189db75d2ed65b1e39de
- d791a7abb593b9da3737189db75d2ed65b1e39de kabi: rename RH_KABI_USE2 to RH_KABI_USE_SPLIT
+https://gitlab.com/cki-project/kernel-ark/-/commit/ab0b3652e4c4678eeaa8cd274312595967de88bd
+ ab0b3652e4c4678eeaa8cd274312595967de88bd tags.sh: Ignore redhat/rpm

-https://gitlab.com/cki-project/kernel-ark/-/commit/7db0743b1797c99ed45875efcfb4fa90d33bb72f
- 7db0743b1797c99ed45875efcfb4fa90d33bb72f kabi: change RH_KABI_REPLACE2 to RH_KABI_REPLACE_SPLIT
+https://gitlab.com/cki-project/kernel-ark/-/commit/25566f7ccd9eb8087f279cd26dfbf439074fa8ff
+ 25566f7ccd9eb8087f279cd26dfbf439074fa8ff put RHEL info into generated headers

-https://gitlab.com/cki-project/kernel-ark/-/commit/0162134f3604b0c134781c505a35512cae75910a
- 0162134f3604b0c134781c505a35512cae75910a kabi: change RH_KABI_REPLACE_UNSAFE to RH_KABI_BROKEN_REPLACE
+https://gitlab.com/cki-project/kernel-ark/-/commit/4e59dc86dc6daf161ae0d928346a2fd12f31e031
+ 4e59dc86dc6daf161ae0d928346a2fd12f31e031 aarch64: acpi scan: Fix regression related to X-Gene UARTs

-https://gitlab.com/cki-project/kernel-ark/-/commit/a2fae0f8ce6145b3062a07407e64351a7660120c
- a2fae0f8ce6145b3062a07407e64351a7660120c kabi: introduce RH_KABI_ADD_MODIFIER
+https://gitlab.com/cki-project/kernel-ark/-/commit/b9c2a82384c4493783fc7a571d8070f302fe74f4
+ b9c2a82384c4493783fc7a571d8070f302fe74f4 ACPI / irq: Workaround firmware issue on X-Gene based m400

-https://gitlab.com/cki-project/kernel-ark/-/commit/6ac632094de0db6309e4a43c54e5b0405bcadb1b
- 6ac632094de0db6309e4a43c54e5b0405bcadb1b kabi: Include kconfig.h
+https://gitlab.com/cki-project/kernel-ark/-/commit/eab12b4592acce3d120d8af1474fac13e1f1394f
+ eab12b4592acce3d120d8af1474fac13e1f1394f modules: add rhelversion MODULE_INFO tag

-https://gitlab.com/cki-project/kernel-ark/-/commit/a4248d5c41665d7a193ba5debf1a928c61232c0f
- a4248d5c41665d7a193ba5debf1a928c61232c0f kabi: macros for intentional kABI breakage
+https://gitlab.com/cki-project/kernel-ark/-/commit/683a3e6972ce2bbf5389b5653745ca3956423248
+ 683a3e6972ce2bbf5389b5653745ca3956423248 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support

-https://gitlab.com/cki-project/kernel-ark/-/commit/4887efffad2ddbf5b8609b997a5b8fcf9e1d365f
- 4887efffad2ddbf5b8609b997a5b8fcf9e1d365f kabi: fix the note about terminating semicolon
+https://gitlab.com/cki-project/kernel-ark/-/commit/ffcd2fe1776dd3b28590f1516b822b434232e3ab
+ ffcd2fe1776dd3b28590f1516b822b434232e3ab Pull the RHEL version defines out of the Makefile

-https://gitlab.com/cki-project/kernel-ark/-/commit/fbcb1e4008cf923902b89e2e0139723007fca1fb
- fbcb1e4008cf923902b89e2e0139723007fca1fb kabi: introduce RH_KABI_HIDE_INCLUDE and RH_KABI_FAKE_INCLUDE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f97ebc29f73891b2d6f99f2ced1b261f676f6cf9
- f97ebc29f73891b2d6f99f2ced1b261f676f6cf9 pci.h: Fix static include
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/887a1c3dd0e03ad0fd890cb96d91a16ab0637192
- 887a1c3dd0e03ad0fd890cb96d91a16ab0637192 drivers/pci/pci-driver.c: Fix if/ifdef typo
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/1371f2c2807951043baa7bc181764c0b2e3acfb6
- 1371f2c2807951043baa7bc181764c0b2e3acfb6 kernel/rh_taint.c: Update to new messaging
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e7cf668aa148c0e5f6e81f6fde9ea9d93a29af52
- e7cf668aa148c0e5f6e81f6fde9ea9d93a29af52 redhat: Add mark_driver_deprecated()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/81704dfde206c0ca62a37626227a14418259ba73
- 81704dfde206c0ca62a37626227a14418259ba73 [scsi] megaraid_sas: re-add certain pci-ids
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/2cb0ca8132ef63aed4c7b00b63c79dd97e262cef
- 2cb0ca8132ef63aed4c7b00b63c79dd97e262cef RHEL: disable io_uring support
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9a1b6530d2b6c2d783ecba7c9a560ed9e4c2e7f2
- 9a1b6530d2b6c2d783ecba7c9a560ed9e4c2e7f2 bpf: Fix unprivileged_bpf_disabled setup
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/cc288cbc2e9f3b272759e57816dbb4f14118f0e9
- cc288cbc2e9f3b272759e57816dbb4f14118f0e9 nvme: nvme_mpath_init remove multipath check
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/871ff0082ebb1a82fc5dead8562ae5f261754f16
- 871ff0082ebb1a82fc5dead8562ae5f261754f16 wireguard: disable in FIPS mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/723d67a6ba1479f87d1ef4b913455a6aadd5df0d
- 723d67a6ba1479f87d1ef4b913455a6aadd5df0d nvme: decouple basic ANA log page re-read support from native multipathing
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/0e26d367b97b6de7112d0d6a02d62139c60c38b5
- 0e26d367b97b6de7112d0d6a02d62139c60c38b5 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/10dca6476e62f098b6c63aa902ef2434369d2d23
- 10dca6476e62f098b6c63aa902ef2434369d2d23 nvme: Return BLK_STS_TARGET if the DNR bit is set
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/496f9afd435027631dad9ae552e18b79819cff19
- 496f9afd435027631dad9ae552e18b79819cff19 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9480b57ee00697b9ab1b2bde521f0e1105e373cc
- 9480b57ee00697b9ab1b2bde521f0e1105e373cc redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/fc766278350e91971b82fd139f92b2ff389ff6d8
- fc766278350e91971b82fd139f92b2ff389ff6d8 arch/x86: Remove vendor specific CPU ID checks
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/d919e35ebf8f3e096b2cbe316a21d4116491fbe3
- d919e35ebf8f3e096b2cbe316a21d4116491fbe3 redhat: Replace hardware.redhat.com link in Unsupported message
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f05f4f7dfdce1c1e42bcc2e52b59ce88f7003383
- f05f4f7dfdce1c1e42bcc2e52b59ce88f7003383 x86: Fix compile issues with rh_check_supported()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/b3118483a28ae9c9d7d7843d9ecff6dcc6e94e04
- b3118483a28ae9c9d7d7843d9ecff6dcc6e94e04 KEYS: Make use of platform keyring for module signature verify
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ffc82733dd3eb42690e7f3fe2e5e5d3e676d66eb
- ffc82733dd3eb42690e7f3fe2e5e5d3e676d66eb Input: rmi4 - remove the need for artificial IRQ in case of HID
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/dfc42424e9feffeefbae72eeffacb98e9880a756
- dfc42424e9feffeefbae72eeffacb98e9880a756 ARM: tegra: usb no reset
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/150dbf19fd562441b2563e3c6af71182986e4615
- 150dbf19fd562441b2563e3c6af71182986e4615 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5c3e5648a6c84ef51f8c5844d43c2095e1abb089
- 5c3e5648a6c84ef51f8c5844d43c2095e1abb089 redhat: rh_kabi: deduplication friendly structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8b17f91c49774e81362db902023aedbc06ab1708
- 8b17f91c49774e81362db902023aedbc06ab1708 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/385d1bea3f52fa42b26d621b335da995964b202a
- 385d1bea3f52fa42b26d621b335da995964b202a redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/e42a306ef6558f02c1bf506109d6ccb4e12e4549
- e42a306ef6558f02c1bf506109d6ccb4e12e4549 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f679eb0a8d537dce96b6eb50ed5c67356c08b798
- f679eb0a8d537dce96b6eb50ed5c67356c08b798 redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/2220337d5c666bed3f26cf9de5515daf96f3d215
- 2220337d5c666bed3f26cf9de5515daf96f3d215 redhat: rh_kabi: Add macros to size and extend structs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/ceda0d704694b831dd352bd68b76d2d8f18b38c4
- ceda0d704694b831dd352bd68b76d2d8f18b38c4 Removing Obsolete hba pci-ids from rhel8
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/21ec07cacb9d3a8c3f78d12da3ed7ee4b4e5e4c7
- 21ec07cacb9d3a8c3f78d12da3ed7ee4b4e5e4c7 mptsas: pci-id table changes
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/224889c499c1f6927c2a3be723619d4988d7bb96
- 224889c499c1f6927c2a3be723619d4988d7bb96 mptsas: Taint kernel if mptsas is loaded
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/27ea7ab1849c0451c46421d87bb6f03906386459
- 27ea7ab1849c0451c46421d87bb6f03906386459 mptspi: pci-id table changes
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6c2db391d56712e2ef3da1579756f843bbb93233
- 6c2db391d56712e2ef3da1579756f843bbb93233 qla2xxx: Remove PCI IDs of deprecated adapter
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/cbc0565e6945ce351bb4f4818a90a470e09947b7
- cbc0565e6945ce351bb4f4818a90a470e09947b7 be2iscsi: remove unsupported device IDs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9a7bf7901f552159e164e4dc4683cf9f5a7ef011
- 9a7bf7901f552159e164e4dc4683cf9f5a7ef011 mptspi: Taint kernel if mptspi is loaded
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6689f5d8a7ed502defc89b71ba82e7671f2dc18f
- 6689f5d8a7ed502defc89b71ba82e7671f2dc18f hpsa: remove old cciss-based smartarray pci ids
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/b6126b58631f0f6e2dbf85d55e48d653731f5aa0
- b6126b58631f0f6e2dbf85d55e48d653731f5aa0 qla4xxx: Remove deprecated PCI IDs from RHEL 8
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/82b882f7dab483d328e1c70f456eba72fb9baa4a
- 82b882f7dab483d328e1c70f456eba72fb9baa4a aacraid: Remove depreciated device and vendor PCI id's
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/7a5c406a81e4d01d8d75c9ceb8d59f5d00118a52
- 7a5c406a81e4d01d8d75c9ceb8d59f5d00118a52 megaraid_sas: remove deprecated pci-ids
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/4bffe5fc437a8fccb2e3aca77fbe63f1173e3682
- 4bffe5fc437a8fccb2e3aca77fbe63f1173e3682 mpt*: remove certain deprecated pci-ids
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c609e98be7d86d7c3c45e5a6e7868638279489d8
- c609e98be7d86d7c3c45e5a6e7868638279489d8 kernel: add SUPPORT_REMOVED kernel taint
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/50238d7256f0a6c650e262246847a2d1fa78b1be
- 50238d7256f0a6c650e262246847a2d1fa78b1be Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/60d5a725435703e5be0111c524b99436bd686739
- 60d5a725435703e5be0111c524b99436bd686739 s390: Lock down the kernel when the IPL secure flag is set
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/3709ed415f13588fced967784e891aea09c79fb8
- 3709ed415f13588fced967784e891aea09c79fb8 efi: Lock down the kernel if booted in secure boot mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/704188e79bace05e38f5cff10b243d8e57aa770b
- 704188e79bace05e38f5cff10b243d8e57aa770b efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c313116ecd1fe48cbd5e440ef007e64b4aea72d9
- c313116ecd1fe48cbd5e440ef007e64b4aea72d9 security: lockdown: expose a hook to lock the kernel down
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/12557da3607a689bf58d869a5d8a41ba313a08bf
- 12557da3607a689bf58d869a5d8a41ba313a08bf Make get_cert_list() use efi_status_to_str() to print error messages.
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f96730b403a570b0334c441103ab7e929c4c7a38
- f96730b403a570b0334c441103ab7e929c4c7a38 Add efi_status_to_str() and rework efi_status_to_err().
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/1b554591d814f2990d024a06d61ca29ea01fae03
- 1b554591d814f2990d024a06d61ca29ea01fae03 Add support for deprecating processors
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/96fc8f0e1c0c636a3be37f01f2f27e215bd35de8
- 96fc8f0e1c0c636a3be37f01f2f27e215bd35de8 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/b0d4254506a25f52bc2bf23d4ff6643d3f37f1eb
- b0d4254506a25f52bc2bf23d4ff6643d3f37f1eb iommu/arm-smmu: workaround DMA mode issues
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9d757226a801a9a3b88d2aa25226b503f3dfeba4
- 9d757226a801a9a3b88d2aa25226b503f3dfeba4 rh_kabi: introduce RH_KABI_EXCLUDE
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f3e9ed1800fb9caff75232c68c8fad030d365eca
- f3e9ed1800fb9caff75232c68c8fad030d365eca ipmi: do not configure ipmi for HPE m400
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/bdb4f547d28e0159c3ee30724e539fdb68fd3cff
- bdb4f547d28e0159c3ee30724e539fdb68fd3cff kABI: Add generic kABI macros to use for kABI workarounds
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/cef8fcacaddd12171953f54efda0641d17d0c136
- cef8fcacaddd12171953f54efda0641d17d0c136 add pci_hw_vendor_status()
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/25d8e8de0641714b328e0d77247b0ea0c83e86f6
- 25d8e8de0641714b328e0d77247b0ea0c83e86f6 ahci: thunderx2: Fix for errata that affects stop engine
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/47bbd25edb0292fd232d3410b132d3f6d62b0c35
- 47bbd25edb0292fd232d3410b132d3f6d62b0c35 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9baeaef4a453af2837a4c574fa508f760c1232f4
- 9baeaef4a453af2837a4c574fa508f760c1232f4 bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/64e29f2adf5c00c4f18e5d8fbe537dbc1217f668
- 64e29f2adf5c00c4f18e5d8fbe537dbc1217f668 add Red Hat-specific taint flags
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/04152e9d3017bc1a839eee2b9b8b8e8c3fa25bab
- 04152e9d3017bc1a839eee2b9b8b8e8c3fa25bab tags.sh: Ignore redhat/rpm
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/5b41320501a543e4d3a6ed45a7727583f8e37085
- 5b41320501a543e4d3a6ed45a7727583f8e37085 put RHEL info into generated headers
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/8fc319ec0dbda18f58f5118db9bea04918c9aaaf
- 8fc319ec0dbda18f58f5118db9bea04918c9aaaf aarch64: acpi scan: Fix regression related to X-Gene UARTs
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/c42bd78f8a6c8dd572a3fbf155ba98ebe3df0508
- c42bd78f8a6c8dd572a3fbf155ba98ebe3df0508 ACPI / irq: Workaround firmware issue on X-Gene based m400
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/f87cc03ce15b9306627554cd107ca59e65d9e0c4
- f87cc03ce15b9306627554cd107ca59e65d9e0c4 modules: add rhelversion MODULE_INFO tag
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/29f20768879ce39d6cfcf3d62090a77138716a61
- 29f20768879ce39d6cfcf3d62090a77138716a61 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/6e6d29bf5b2a1bda369e0d50a3189ef37719d5a6
- 6e6d29bf5b2a1bda369e0d50a3189ef37719d5a6 Add Red Hat tainting
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/04c3f390a57195b196e5586bdb71c8eeef3c16e1
- 04c3f390a57195b196e5586bdb71c8eeef3c16e1 Introduce CONFIG_RH_DISABLE_DEPRECATED
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/9c3c3b074c576933be673f718aa7444273317ab5
- 9c3c3b074c576933be673f718aa7444273317ab5 Pull the RHEL version defines out of the Makefile
-
-https://gitlab.com/cki-project/kernel-ark/-/commit/030267e59ba8d0219857aceb6e41fb9ced3b386f
- 030267e59ba8d0219857aceb6e41fb9ced3b386f [initial commit] Add Red Hat variables in the top level makefile
+https://gitlab.com/cki-project/kernel-ark/-/commit/faed0dea26de0d1531c90673e4d6f87856b2c096
+ faed0dea26de0d1531c90673e4d6f87856b2c096 [initial commit] Add Red Hat variables in the top level makefile

--- a/def_variants.yaml.fedora
+++ b/def_variants.yaml.fedora
@ -12,15 +12,12 @@ packages:
    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"]
+  - .*kunit.*: modules-internal
+    exact_pkg: True
+  - .*test[^/]*.ko: modules-internal

  - arch/.*: modules-core
  - crypto/.*: modules-core
@ -31,7 +28,6 @@ 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
@ -42,7 +38,6 @@ 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
@ -57,7 +52,6 @@ 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,8 +65,6 @@ 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
@ -85,7 +77,6 @@ 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
@ -98,7 +89,6 @@ 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
@ -127,17 +117,14 @@ 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

@ -252,13 +239,10 @@ 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
@ -270,7 +254,6 @@ 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
@ -374,7 +357,6 @@ 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
@ -413,23 +395,16 @@ 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
@ -478,17 +453,6 @@ rules:
  - net/rds/rds.*: modules-extra
  - net/rose/rose.*: modules-extra
  - net/rxrpc/.*: modules-core
-  - net/sched/sch_choke.*: modules-extra
-  - net/sched/sch_drr.*: modules-extra
-  - net/sched/sch_etf.*: modules-extra
-  - net/sched/sch_gred.*: modules-extra
-  - net/sched/sch_mqprio.ko: modules-extra
-  - net/sched/sch_multiq.*: modules-extra
-  - net/sched/sch_netem.*: modules-extra
-  - net/sched/sch_qfq.*: modules-extra
-  - net/sched/sch_red.*: modules-extra
-  - net/sched/sch_sfb.*: modules-extra
-  - net/sched/sch_teql.*: modules-extra
  - net/sched/.*: modules-core
  - net/sunrpc/xprtrdma/rpcrdma.*: modules
  - net/sunrpc/.*: modules-core
@ -498,9 +462,6 @@ rules:
  - 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
@ -12,18 +12,15 @@ 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:
-  - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
-    if_variant_in: ["rt"]
+  - .*kunit.*: modules-internal
+    exact_pkg: True
+  - .*test[^/]*.ko: modules-internal

  - arch/.*: modules-core
  - block/t10-pi.ko: modules-core
@ -35,7 +32,6 @@ 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
@ -47,7 +43,6 @@ 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
@ -63,7 +58,6 @@ 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
@ -77,8 +71,6 @@ 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
@ -91,7 +83,6 @@ 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
@ -104,7 +95,6 @@ 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
@ -129,15 +119,12 @@ 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

@ -255,14 +242,11 @@ 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
@ -274,7 +258,6 @@ 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
@ -350,7 +333,7 @@ rules:
  - drivers/usb/misc/.*: modules
  - drivers/usb/serial/.*: modules
  - drivers/usb/typec/mux/nb7vpq904m.*: modules
-  - drivers/usb/usbip/.*: modules-extra
+  - drivers/usb/usbip/.*: modules-internal
  - drivers/usb/.*: modules-core

  - drivers/vdpa/mlx5/mlx5_vdpa.*: modules
@ -381,7 +364,6 @@ 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
@ -421,25 +403,18 @@ 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
@ -494,16 +469,6 @@ rules:
  - net/rds/rds.*: modules-extra
  - net/rose/rose.*: modules-extra
  - net/rxrpc/.*: modules-partner
-  - net/sched/sch_choke.*: modules-extra
-  - net/sched/sch_drr.*: modules-extra
-  - net/sched/sch_gred.*: modules-extra
-  - net/sched/sch_mqprio.ko: modules-extra
-  - net/sched/sch_multiq.*: modules-extra
-  - net/sched/sch_netem.*: modules-extra
-  - net/sched/sch_qfq.*: modules-extra
-  - net/sched/sch_red.*: modules-extra
-  - net/sched/sch_sfb.*: modules-extra
-  - net/sched/sch_teql.*: modules-extra
  - net/sched/.*: modules-core
  - net/sctp/.*: modules-extra
  - net/sunrpc/xprtrdma/rpcrdma.*: modules
@ -515,8 +480,6 @@ rules:
  - net/xfrm/.*: modules-core

  - samples/.*: modules-internal
-  - sound/pci/.*test.*: modules-internal
-  - sound/soc/.*test.*: modules-internal

  - virt/.*: modules-core

--- a/dracut-virt.conf
+++ b/dracut-virt.conf
@ -6,7 +6,7 @@ compress="xz"
 early_microcode="no"

 # modules: basics
-dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown "
+dracutmodules+=" dracut-systemd i18n shutdown "

 # modules: storage support
 dracutmodules+=" dm lvm rootfs-block fs-lib "
@ -27,6 +27,11 @@ dracutmodules+=" systemd-sysext "
 # modules: root disk integrity protection
 dracutmodules+=" systemd-veritysetup "

+# 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
--- a/filtermods.py
+++ b/filtermods.py
@ -823,11 +823,12 @@ class FiltermodTests(unittest.TestCase):
                                                   do_pictures=FiltermodTests.do_pictures,
                                                   variants=['rt'])

-        self.assertIsNotNone(self.pkg_list.get('rt-kvm'))
+        self.assertIsNotNone(self.pkg_list.get('modules-other'))
        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', 'rt-kvm')
+        self._is_kmod_pkg('kmod4', 'modules-other')
+

    def test2(self):
        self.pkg_list, self.kmod_list = sort_kmods(get_td('test2.dep'), get_td('test2.yaml'),
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
--- a/kernel-aarch64-rt-64k-debug-fedora.config
+++ b/kernel-aarch64-rt-64k-debug-fedora.config
--- a/kernel-aarch64-rt-64k-debug-rhel.config
+++ b/kernel-aarch64-rt-64k-debug-rhel.config
--- a/kernel-aarch64-rt-64k-fedora.config
+++ b/kernel-aarch64-rt-64k-fedora.config
--- a/kernel-aarch64-rt-64k-rhel.config
+++ b/kernel-aarch64-rt-64k-rhel.config
--- a/kernel-aarch64-rt-debug-fedora.config
+++ b/kernel-aarch64-rt-debug-fedora.config
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
--- a/kernel-aarch64-rt-fedora.config
+++ b/kernel-aarch64-rt-fedora.config
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
--- a/kernel-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-debug-rhel.config
+++ b/kernel-riscv64-debug-rhel.config
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
--- a/kernel-riscv64-rhel.config
+++ b/kernel-riscv64-rhel.config
--- a/kernel-riscv64-rt-debug-fedora.config
+++ b/kernel-riscv64-rt-debug-fedora.config
--- a/kernel-riscv64-rt-fedora.config
+++ b/kernel-riscv64-rt-fedora.config
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
--- a/kernel-x86_64-rt-debug-fedora.config
+++ b/kernel-x86_64-rt-debug-fedora.config
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
--- a/kernel-x86_64-rt-fedora.config
+++ b/kernel-x86_64-rt-fedora.config
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
--- a/kernel.changelog
+++ b/kernel.changelog
--- a/kernel.sbat.template
+++ b/kernel.sbat.template
@ -0,0 +1,2 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com
--- a/kernel.spec
+++ b/kernel.spec
--- a/partial-clang_lto-aarch64-debug-snip.config
+++ b/partial-clang_lto-aarch64-debug-snip.config
@ -1,4 +1,6 @@
 # clang_lto
+# CONFIG_AUTOFDO_CLANG is not set
 # CONFIG_DRM_WERROR is not set
 CONFIG_KASAN_STACK=y
 # CONFIG_KMSAN is not set
+# CONFIG_PROPELLER_CLANG is not set
--- a/partial-clang_lto-x86_64-debug-snip.config
+++ b/partial-clang_lto-x86_64-debug-snip.config
@ -1,4 +1,6 @@
 # clang_lto
+# CONFIG_AUTOFDO_CLANG is not set
 # CONFIG_DRM_WERROR is not set
 CONFIG_KASAN_STACK=y
 # CONFIG_KMSAN is not set
+# CONFIG_PROPELLER_CLANG is not set
--- a/partial-clang_lto-x86_64-snip.config
+++ b/partial-clang_lto-x86_64-snip.config
@ -1,6 +1,8 @@
 # clang_lto
+# CONFIG_AUTOFDO_CLANG is not set
 # CONFIG_DRM_WERROR is not set
 # CONFIG_KASAN_STACK is not set
 # CONFIG_KMSAN is not set
 CONFIG_LTO_CLANG_THIN=y
 # CONFIG_LTO_NONE is not set
+# CONFIG_PROPELLER_CLANG is not set
--- a/partial-kgcov-debug-snip.config
+++ b/partial-kgcov-debug-snip.config
@ -2,3 +2,5 @@
 CONFIG_GCOV_KERNEL=y
 CONFIG_GCOV_PROFILE_ALL=y
 # CONFIG_GCOV_PROFILE_FTRACE is not set
+CONFIG_GCOV_PROFILE_RDS=y
+CONFIG_GCOV_PROFILE_URING=y
--- a/partial-kgcov-snip.config
+++ b/partial-kgcov-snip.config
@ -2,3 +2,5 @@
 CONFIG_GCOV_KERNEL=y
 CONFIG_GCOV_PROFILE_ALL=y
 # CONFIG_GCOV_PROFILE_FTRACE is not set
+CONFIG_GCOV_PROFILE_RDS=y
+CONFIG_GCOV_PROFILE_URING=y
--- a/patch-6.11-redhat.patch
+++ b/patch-6.11-redhat.patch
--- a/patch-6.17-redhat.patch
+++ b/patch-6.17-redhat.patch
--- a/process_configs.sh
+++ b/process_configs.sh
@ -1,20 +1,24 @@
 #!/bin/bash
 #
-# This script takes the merged config files and processes them through oldconfig
-# and listnewconfig
+# This script takes the merged config files and processes them through olddefconfig
+# and listnewconfig to ensure kernel configurations are valid and complete.
 #
 # 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: continue on error"
+	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 "     -n: error on unset config options"
 	echo "     -t: test run, do not overwrite original config"
 	echo "     -w: error on misconfigured config options"
@ -33,6 +37,9 @@ 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
@ -43,7 +50,8 @@ get_cross_compile()
 	fi
 }

-# stupid function to find top of tree to do kernel make configs
+# Find the top-level kernel source directory
+# (identified by MAINTAINERS file and drivers directory)
 switch_to_toplevel()
 {
 	path="$(pwd)"
@ -60,11 +68,124 @@ 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()
 {
-	count=$3
-	variant=$4
+	cfg=$1      # Original config file
+	cfgtmp=$2   # Generated config file
+	count=$3    # Counter for unique filenames
+	variant=$4  # Config variant (e.g., debug, rt)

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

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

 	checkoptions_error=false
 	if test -s .mismatches"${count}"
@ -107,11 +228,18 @@ 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)
@ -154,12 +282,14 @@ 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");
@ -194,12 +324,32 @@ 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
@ -232,10 +382,12 @@ function commit_new_configs()
 		echo "done"
 	done

-	git add "$SCRIPT_DIR/pending$FLAVOR"
-	git commit -m "[redhat] AUTOMATIC: New configs"
+	# Commit the new configuration files to git
+	git add "$SCRIPT_DIR/pending-$FLAVOR"
+	git commit -m "[redhat] AUTOMATIC: New $FLAVOR configs"
 }

+# Process a single configuration file
 function process_config()
 {
 	local cfg
@ -305,16 +457,13 @@ 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
@ -340,7 +489,13 @@ function process_configs()
 		cat .errors*
 		rm .errors* -f
 	fi
-	if ls .mismatches* 1> /dev/null 2>&1; then
+
+	# 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
 		RETURNCODE=1
 		cat .mismatches*
 		rm .mismatches* -f
@ -352,11 +507,13 @@ function process_configs()
 }

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

 RETURNCODE=0

@ -365,7 +522,9 @@ do
 	key="$1"
 	case $key in
 		-a)
+			# Enable all error checking options
 			CHECKOPTIONS="x"
+			IGNOREERRORS="x"
 			NEWOPTIONS="x"
 			CHECKWARNINGS="x"
 			;;
@ -375,6 +534,9 @@ do
 		-h)
 			usage
 			;;
+		-i)
+			IGNOREERRORS="x"
+			;;
 		-n)
 			NEWOPTIONS="x"
 			;;
@ -389,11 +551,16 @@ 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
@ -401,17 +568,11 @@ 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"

@ -421,4 +582,8 @@ else
 	process_configs
 fi

-exit $RETURNCODE
+if test -n "$IGNOREERRORS"; then
+	exit 0
+else
+	exit $RETURNCODE
+fi
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -23,9 +23,10 @@ emptyrpm:
 patches:
    ignore_list:
        - linux-kernel-test.patch
-        - patch-6.11-redhat.patch
+        - patch-6.17-redhat.patch

 runpath:
    ignore:
        - /usr/libexec/kselftests/bpf/urandom_read
        - /usr/libexec/kselftests/bpf/no_alu32/urandom_read
+        - /usr/libexec/kselftests/bpf/cpuv4/urandom_read
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.11.tar.xz) = bb8a228ff8fba36e3e2c2f24dbe2b5926af0daa8a472872fbc9ac4e81599bab46b399cf4a34022db3aa47a5476ab81bf9ecae1725bf11e7f0b01b0e2c91bc0ee
-SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 3aa0be89a71ee2f41b38fe56830bf63fab0b82ae0ab9fb296355ec04dbc9d8e8d5ab5847d34854fcf7ea5c21c120fe98c33729cd4ae1ccb25bfdd9f3fc340d6f
-SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b9a43771e958d7b7460667bd0e2b300d43f2bc95d776ca1a6ce18214addcdf4aba24526421ac6b8ab031f5cf56ca0d152203beb1c42f786782cfcef7d39a6616
+SHA512 (linux-6.17.10.tar.xz) = 80b305535fd724b8e80bb10fad5028ed87181dc8e478aa2bd2873ce3528db51d2274accfa71fef1403a90377b631d046f8346da257a638d86356b79f829478bd
+SHA512 (kernel-abi-stablelists-6.17.10.tar.xz) = 0ab3b0deab998fc509451a6becc9b0a6ee912cd550e7bca9cea24639373f8d168626790f8ba330e548eef1b3a88565993e4cbe7dd8986000bfd7ac51a6d34720
+SHA512 (kernel-kabi-dw-6.17.10.tar.xz) = 8c6b69059da21b2e85fc4159ee9085fb9c826032926341db49ae76b4afc019a6fee3773ab68101436ec55e7388e45d23147604ae39ab274d869e3399895fd52f
--- a/uki-addons.sbat.template
+++ b/uki-addons.sbat.template
@ -0,0 +1,2 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+kernel-uki-virt-addons.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt-addons,@KVER,mailto:secalert@redhat.com
--- a/uki.sbat.template
+++ b/uki.sbat.template
@ -0,0 +1,2 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+kernel-uki-virt.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt,@KVER,mailto:secalert@redhat.com
--- a/uki_addons.json
+++ b/uki_addons.json
@ -1,4 +1,33 @@
 {
+    "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": [
@ -7,6 +36,13 @@
            "fips-enable.addon": [
                "fips=1\n"
            ]
+        },
+        "rhel": {
+            "aarch64": {
+                "crashkernel-default.addon": [
+                    "crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M\n"
+                ]
+            }
        }
    }
 }
--- a/uki_create_addons.py
+++ b/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
+# Usage: python uki_create_addons.py input_json out_dir uki distro arch [sbat]
 #
 # This tool requires the systemd-ukify and systemd-boot packages.
 #
@ -26,14 +26,6 @@
 # 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
@ -45,7 +37,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')
+    print(f'Usage: {os.path.basename(__file__)} input_json output_dir uki distro arch [sbat]')
    print(f'Error:{err}')
    sys.exit(1)

@ -62,9 +54,8 @@ 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, rstrip=True):
+def parse_lines(lines):
    cmdline = ''
    for l in lines:
        l = l.lstrip()
@ -72,27 +63,17 @@ def parse_lines(lines, rstrip=True):
            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
+        cmdline += l.rstrip() + ' '
    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:
@ -121,21 +102,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):
+def create_addons(out_dir, sbat):
    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() +'"')
+            '--cmdline', uki_addon.cmdline,
+            '--output', out_path]
+        if sbat:
+            cmd.extend(['--sbat', sbat.rstrip()])

        subprocess.check_call(cmd, text=True)

 if __name__ == "__main__":
    argc = len(sys.argv) - 1
-    if argc != 5:
+    if argc < 5 or argc > 6:
        usage('too few or too many parameters!')

    input_json = sys.argv[1]
@ -144,8 +125,12 @@ 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)
+    create_addons(out_dir, custom_sbat)