diff --git a/.pick_status.json b/.pick_status.json
index b3025f42a80..2db58488b94 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1074,7 +1074,7 @@
         "description": "nvk: Add a _pad field to nvk_fs_key",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ae171458827bb8fceb232b3a13f61920e87a0d3a",
         "notes": null
diff --git a/src/nouveau/compiler/nak.h b/src/nouveau/compiler/nak.h
index 5a3cf249401..3ace1e5cfed 100644
--- a/src/nouveau/compiler/nak.h
+++ b/src/nouveau/compiler/nak.h
@@ -32,6 +32,8 @@ nak_nir_options(const struct nak_compiler *nak);
 void nak_optimize_nir(nir_shader *nir, const struct nak_compiler *nak);
 void nak_preprocess_nir(nir_shader *nir, const struct nak_compiler *nak);
 
+PRAGMA_DIAGNOSTIC_PUSH
+PRAGMA_DIAGNOSTIC_ERROR(-Wpadded)
 struct nak_fs_key {
    bool zs_self_dep;
 
@@ -40,6 +42,8 @@ struct nak_fs_key {
     */
    bool force_sample_shading;
 
+   uint8_t _pad;
+
    /**
     * The constant buffer index and offset at which the sample locations table lives.
     * Each sample location is two 4-bit unorm values packed into an 8-bit value
@@ -48,6 +52,9 @@ struct nak_fs_key {
    uint8_t sample_locations_cb;
    uint32_t sample_locations_offset;
 };
+PRAGMA_DIAGNOSTIC_POP
+static_assert(sizeof(struct nak_fs_key) == 8, "This struct has no holes");
+
 
 void nak_postprocess_nir(nir_shader *nir, const struct nak_compiler *nak,
                          nir_variable_mode robust2_modes,