From 7efa90a50203ca08166dcc37a5b0a2cd652b657c Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 5 Feb 2024 11:05:10 -0800
Subject: [PATCH] Merged through September 29, 2023

---
 .last_merge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.last_merge b/.last_merge
index 3450387273ac..62318cf9a01a 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20230922
+freebsd-main-20230929