From bc9cb1c9d7168d96df4f515e643bbe6ab0e6c2d3 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 4 Sep 2024 18:38:23 -0400
Subject: [PATCH] Merged through June 7, 2024

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

diff --git a/.last_merge b/.last_merge
index 4178fc32f7d1..6e9a1b50a222 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20240531
+freebsd-main-20240607