From c59458a5b54bcb31f33a4e7c999249645734676c Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 14 Mar 2024 09:50:53 -0700
Subject: [PATCH] Merged through January 5, 2024

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

diff --git a/.last_merge b/.last_merge
index 57f29ac2f8ec..e4e4012a6261 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20231229
+freebsd-main-20240105