From 8bf870cff3f042d05a250a7e29d7e0f4bb8ee8ac Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 29 Oct 2024 14:56:02 -0400
Subject: [PATCH] Merged through June 28, 2024

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

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