From b6eeda6e6b2c984dd6df874b849ac73227266e0c Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Mar 2024 18:22:27 -0700
Subject: [PATCH] Merged through December 22, 2023

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

diff --git a/.last_merge b/.last_merge
index 17b4244bed96..f7aeb80cdbca 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20231215
+freebsd-main-20231222