From 4e88138d9db75493f7c0b337adbfb33a5375fb47 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 8 Feb 2024 11:31:35 -0800
Subject: [PATCH] Merged through October 6, 2023

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

diff --git a/.last_merge b/.last_merge
index 62318cf9a01a..b0be08199488 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20230929
+freebsd-main-20231006