From dbb987e4a178a17827d7d75f14f1d1581da1ae51 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 25 Oct 2024 11:09:37 -0400
Subject: [PATCH] Merged through June 21, 2024

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

diff --git a/.last_merge b/.last_merge
index a7619f3e80bd..3a6495fb358a 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20240614
+freebsd-main-20240621