git: f3e20afcc1df - stable/15 - __FreeBSD_version: Bump for mkimg %align feature

The branch stable/15 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=f3e20afcc1dfbab1eb3ff511f23db9f4390e5af4

commit f3e20afcc1dfbab1eb3ff511f23db9f4390e5af4
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-10-08 00:47:49 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-10-28 05:45:04 +0000

    __FreeBSD_version: Bump for mkimg %align feature
    
    MFC after:      1 week
    Sponsored by:   Amazon
    Differential Revision:  https://reviews.freebsd.org/D60453
    
    (cherry picked from commit 0f787e867d217583017181d1a904933939b4c34d)
---
 Makefile.inc1   | 6 +++---
 sys/sys/param.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 2fbbea26a3af..066739a535c6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2683,9 +2683,9 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf
 .endif
 .endif
 
-# 1600027, 1501504: vmdks support
-.if ${BOOTSTRAPPING} < 1501504 || \
-	(${BOOTSTRAPPING} > 1600000 && ${BOOTSTRAPPING} < 1600027) || \
+# 1501505, 1600029: %align support
+.if ${BOOTSTRAPPING} < 1501505 || \
+    (${BOOTSTRAPPING} >= 1600000 && ${BOOTSTRAPPING} < 1600029) || \
 	${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no"
 _mkimg=	usr.bin/mkimg
 ${_bt}-usr.bin/mkimg: ${_bt}-lib/libz
diff --git a/sys/sys/param.h b/sys/sys/param.h
index c4297ff9e577..4b140fc5e4ff 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -74,7 +74,7 @@
  * cannot include sys/param.h and should only be updated here.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1501504
+#define __FreeBSD_version 1501505
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,