From 0192d4e32e52c251a0675178be9bb2da643f8613 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Mar 2024 13:35:09 -0700
Subject: [PATCH] Merged through December 15, 2023

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

diff --git a/.last_merge b/.last_merge
index 8a891193ec01..17b4244bed96 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20231208
+freebsd-main-20231215