diff --git a/pageserver/src/storage_sync.rs b/pageserver/src/storage_sync.rs
index 4f4be9427c..14f366042b 100644
--- a/pageserver/src/storage_sync.rs
+++ b/pageserver/src/storage_sync.rs
@@ -190,6 +190,12 @@ pub struct RemoteTimelineClient {
 
     storage_impl: GenericRemoteStorage,
 }
+
+// clippy warns that Uninitialized is much smaller than Initialized, which wastes
+// memory for Uninitialized variants. Doesn't matter in practice, there are not
+// that many upload queues in a running pageserver, and most of them are initialized
+// anyway.
+#[allow(clippy::large_enum_variant)]
 enum UploadQueue {
     Uninitialized,
     Initialized(UploadQueueInitialized),
diff --git a/vendor/postgres-v14 b/vendor/postgres-v14
index cd0693e2be..360ff1c637 160000
--- a/vendor/postgres-v14
+++ b/vendor/postgres-v14
@@ -1 +1 @@
-Subproject commit cd0693e2be224bedfa0b61f9c5e2ff4cd88eec2c
+Subproject commit 360ff1c637a57d351a7a5a391d8e8afd8fde8c3a
diff --git a/vendor/postgres-v15 b/vendor/postgres-v15
index 1bf5e3f53c..d31b3f7c6d 160000
--- a/vendor/postgres-v15
+++ b/vendor/postgres-v15
@@ -1 +1 @@
-Subproject commit 1bf5e3f53cbb2f5b569ed2da6d014c245841c24e
+Subproject commit d31b3f7c6d108e52c8bb11e812ce4e266501ea3d