From c1101b9f71b36b757061468d282f548fa8d71765 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Sun, 8 Sep 2024 17:02:42 -0400
Subject: [PATCH] Merged through June 14, 2024

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

diff --git a/.last_merge b/.last_merge
index 6e9a1b50a222..a7619f3e80bd 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20240607
+freebsd-main-20240614