From cfca9fa6fbc1fcb09723571e319caf95888b6d84 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 7 Aug 2024 06:58:20 -0400
Subject: [PATCH] Merged through April 5, 2024

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

diff --git a/.last_merge b/.last_merge
index 88f515f3ac8b..60175cb0e800 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20240329
+freebsd-main-20240405