From nobody Wed Oct 28 05:52:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jDxN93hwyz6wrQJ for ; Wed, 28 Oct 2026 05:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jDxN91gSbz4LRT for ; Wed, 28 Oct 2026 05:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6fJCM85o2mXePW9S0nNr2i0lxvn3F1lJy3ln3Pt1jY=; b=tI0ImrexEOoQSISmxiluelcGk+RPw1QqJToB4gROfJzjttc1hvrqJ3e5JmZtnD5Zo/GS+h l8vtku2lazSc3uzmtkiyvLiNzXEniAyCoQO7kQbjeYZh5p/96p27pB8v8Bf4CX+1cDm1GV KcPfrPVBRWuSsEb2DoAYkJt20/b28sgAL+RwDiPYGdB9U9xd1ETGLW3bkcgyjGCw+22tiU 6BT7DTjEFXunuc27S4K7j/J+saB+/PFIza3Uni+evzM5fBFRJfNvGnlX+XvjcKcFt6rSfH vg8gLGxUiO2ihgLn4E8HEaEpbUgxS01DuVePl54d6Bs5J+LBisAUl7QI1WfVAQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793166761; b=FKBNIqMRcjQvG1f2Rb5LMBl03jiTUn7Lkm8mrqTEXhaYIj/zzL+xKTmktcO5uexwNW8nIC n9cklKpqrw6iI2mS3MztqwpavuyFQjQ4hBMz5xJsIotq7Q0L1tngxkeY5+QLMOzftO6qDi ruYTJNCdmbjpebjNhyv7YbqU2pU5VOAgkwI0OSv1A9SrfyMthwAOYSPkg8ATN1pzopidNT 0Pl4qM4jil1t6oabbrN/9F2izGwJAN6YcU1mv96ruusC62PxEwpGW6iYzhGYhnbWYT7vZz 7Pf2HikrF9jyJa/MWtWcVOIPMXPY4kU2sKgenNd/FvVpfNeKYG2XgOPf0cItmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6fJCM85o2mXePW9S0nNr2i0lxvn3F1lJy3ln3Pt1jY=; b=hr1XSw10Sysyn712WYZE1M6+LxzXYuJV4NqAncHKHES/qM5GiCVAbj5sZb5ejCF8ALSECF uSG2nA0Epd9ZFdfGFXtGayRL+7qvY2ziBL2XYvu+pRFqaOUVPpYegFRbrBbT4UybvWAnS5 SJ8R0CDzRGc08qFTe6Kk/oXB+vHCkuI5sFNxoTc5xw19daecje3aGrMbxSzsnzsJHdJecj PVzgf23iXx7YOyox47coDg7/zfpudT8J+hguuDr2hKflaiAxk2XHiB9udZqQOQJuYXhLh3 lyD18EV0h+ym378ASwSkvhp2mGtpVQh6zs51KH93mOCQAiwTV3gcQErUG2a7lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jDxN91Hckzvx0 for ; Wed, 28 Oct 2026 05:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3416e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 05:52:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f3e20afcc1df - stable/15 - __FreeBSD_version: Bump for mkimg %align feature List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f3e20afcc1dfbab1eb3ff511f23db9f4390e5af4 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 05:52:41 +0000 Message-Id: <6ae18da9.3416e.68b65dfe@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f3e20afcc1dfbab1eb3ff511f23db9f4390e5af4 commit f3e20afcc1dfbab1eb3ff511f23db9f4390e5af4 Author: Colin Percival AuthorDate: 2026-10-08 00:47:49 +0000 Commit: Colin Percival 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,