diff --git a/.github/mergify.yml b/.github/mergify.yml
index c3ab267..4ae98ab 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -3,6 +3,12 @@ queue_rules:
     update_method: rebase
     branch_protection_injection_mode: merge
     update_bot_account: openebs-ci
+    merge_conditions:
+      - check-success = code-lint
+      - check-success = commitlint
+    queue_conditions:
+      - check-success = code-lint
+      - check-success = commitlint
 merge_queue:
   max_parallel_checks: 1
 pull_request_rules:
diff --git a/.github/workflows/code-lint.yaml b/.github/workflows/code-lint.yaml
index f2900fb..741d18a 100644
--- a/.github/workflows/code-lint.yaml
+++ b/.github/workflows/code-lint.yaml
@@ -79,3 +79,15 @@ jobs:
           nix_path: ${{ env.NIX_PATH }}
       - name: nix-shell
         run: nix-shell --pure -p nixpkgs-fmt --run "nixpkgs-fmt --check ."
+
+  code-lint:
+    if: always()
+    needs:
+      - rust-lint
+      - rust-dev
+      - nix-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}
diff --git a/nix/pkgs/libspdk/default.nix b/nix/pkgs/libspdk/default.nix
index 608f5c5..81bb018 100644
--- a/nix/pkgs/libspdk/default.nix
+++ b/nix/pkgs/libspdk/default.nix
@@ -92,8 +92,8 @@ let
   # Derivation attributes
   #
   spdk = rec {
-    rev = "b78cde6f5cdd2f0f50810743d2865d7bee825ce4";
-    sha256 = "sha256-GVWrKeYsKpro1XMYblky7ik6qw07aa/4CZqb9JU5cQU=";
+    rev = "24775a47ebf16c066cea47e7da98bed2e4d1d798";
+    sha256 = "sha256-4FkDgIgnuETHZSwmz0SzvKju71NcD6aCmJYnh9OuBsM=";
     pname = "libspdk${nameSuffix}";
     version = "25.05-${lib.substring 0 7 rev}";
     name = "${pname}-${version}";