From cb733a82953a0fb1e3c55b75e22fd1435b83aa30 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 30 Oct 2024 09:20:21 -0400
Subject: [PATCH] Merged through July 5, 2024

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

diff --git a/.last_merge b/.last_merge
index daafead0f6eb..4d3994b2df80 100644
--- a/.last_merge
+++ b/.last_merge
@@ -1 +1 @@
-freebsd-main-20240628
+freebsd-main-20240705