From d0ff4f2a63b573a3f1ee82963d6e6dcaae90e089 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 13 Mar 2024 15:01:30 -0700
Subject: [PATCH] Merged through December 29, 2023

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

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