diff --git a/.pick_status.json b/.pick_status.json
index 23f340f20a6..d641107eb46 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -154,7 +154,7 @@
"description": "driconf: update X4 Foundations executable name",
"nominated": true,
"nomination_type": 2,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "5532f135664c7f67d4a8162336005d0118948343",
"notes": null
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 7e862ad1491..1fa75d2662d 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -936,7 +936,7 @@ TODO: document the other workarounds.
-
+
@@ -1354,7 +1354,7 @@ TODO: document the other workarounds.
-
+