[RLC-10] Rebase Custom Changes to rlc-10/6.12.0-211.66.1.el10_2

.container_build_image

@@ -0,0 +1 @@
+rocky-10-kernel-builder

.github/workflows/build-check_aarch64-rt.yml

@@ -26,7 +26,7 @@ jobs:
           dnf groupinstall 'Development Tools' -y
           dnf install openssl -y
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           ref: "${{ github.event.pull_request.head.sha }}"
           fetch-depth: 0
@@ -35,4 +35,4 @@ jobs:
           git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
           cp configs/kernel-aarch64-rt-rhel.config .config
           make olddefconfig
-          make -j8
+          make -j$(nproc)

.github/workflows/build-check_aarch64.yml

@@ -26,7 +26,7 @@ jobs:
           dnf groupinstall 'Development Tools' -y
           dnf install openssl -y
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           ref: "${{ github.event.pull_request.head.sha }}"
           fetch-depth: 0
@@ -35,4 +35,4 @@ jobs:
           git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
           cp configs/kernel-aarch64-rhel.config .config
           make olddefconfig
-          make -j8
+          make -j$(nproc)

.github/workflows/build-check_x86_64-rt.yml

@@ -26,7 +26,7 @@ jobs:
           dnf groupinstall 'Development Tools' -y
           dnf install openssl -y
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           ref: "${{ github.event.pull_request.head.sha }}"
           fetch-depth: 0
@@ -35,4 +35,4 @@ jobs:
           git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
           cp configs/kernel-x86_64-rt-rhel.config .config
           make olddefconfig
-          make -j8
+          make -j$(nproc)

.github/workflows/build-check_x86_64.yml

@@ -26,7 +26,7 @@ jobs:
           dnf groupinstall 'Development Tools' -y
           dnf install openssl -y
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
         with:
           ref: "${{ github.event.pull_request.head.sha }}"
           fetch-depth: 0
@@ -35,4 +35,4 @@ jobs:
           git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
           cp configs/kernel-x86_64-rhel.config .config
           make olddefconfig
-          make -j8
+          make -j$(nproc)

.github/workflows/kernel-build-and-test-multiarch-trigger.yml

@@ -0,0 +1,11 @@
+name: Trigger Automated kernel build and test (multi-arch)
+
+on:
+  push:
+    branches:
+      - '*_rlc-10/**'
+
+jobs:
+  kernelCI:
+    uses: ctrliq/kernel-src-tree/.github/workflows/kernel-build-and-test-multiarch-trigger.yml@main
+    secrets: inherit

.github/workflows/validate-kernel-commits.yml

@@ -0,0 +1,10 @@
+name: Validate Kernel Commits
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  check:
+    uses: ctrliq/kernel-src-tree/.github/workflows/validate-kernel-commits.yml@main
+    secrets: inherit

MAINTAINERS

@@ -9443,6 +9443,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
 F:	Documentation/filesystems/fuse.rst
 F:	fs/fuse/
 F:	include/uapi/linux/fuse.h
+F:	tools/testing/selftests/filesystems/fuse/
 
 FUTEX SUBSYSTEM
 M:	Thomas Gleixner <tglx@linutronix.de>

configs/kernel-aarch64-64k-debug-rhel.config

@@ -1284,7 +1284,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1294,8 +1295,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2300,6 +2301,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-aarch64-64k-rhel.config

@@ -1284,7 +1284,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1294,8 +1295,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2284,6 +2285,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-aarch64-debug-rhel.config

@@ -1282,7 +1282,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1292,8 +1293,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2297,6 +2298,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-aarch64-rhel.config

@@ -1282,7 +1282,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1292,8 +1293,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2281,6 +2282,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-aarch64-rt-64k-debug-rhel.config

@@ -1285,7 +1285,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1295,8 +1296,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2339,6 +2340,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-aarch64-rt-64k-rhel.config

@@ -1285,7 +1285,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1295,8 +1296,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2323,6 +2324,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-aarch64-rt-debug-rhel.config

@@ -1283,7 +1283,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1293,8 +1294,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2336,6 +2337,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-aarch64-rt-rhel.config

@@ -1283,7 +1283,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1293,8 +1294,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
@@ -2320,6 +2321,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

configs/kernel-ppc64le-debug-rhel.config

@@ -1045,7 +1045,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1054,8 +1055,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set

configs/kernel-ppc64le-rhel.config

@@ -1045,7 +1045,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1054,8 +1055,8 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set

configs/kernel-s390x-debug-rhel.config

@@ -1041,7 +1041,8 @@ CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS_CUSTOM_VERSION is not set
+CONFIG_CRYPTO_FIPS_CUSTOM_VERSION=y
+CONFIG_CRYPTO_FIPS_VERSION="ciq.6.12.20260826"
 CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
@@ -1052,8 +1053,8 @@ CONFIG_CRYPTO_HMAC_S390=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
-# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128 is not set
-CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_128=y
+# CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_2 is not set
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_8192 is not set
 CONFIG_CRYPTO_JITTERENTROPY_OSR=3
 # CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set