FreeBSD/src 34f2f57 — release Makefile.vm

EC2: Use stream-optimized VMDK format

Once enabled on all of the branches, this will reduce bandwidth
consumption from uploading weekly snapshot builds from ~500 GB to
~100 GB, as well as significantly speeding up the process.

MFC after:      2 months
Sponsored by:   Amazon
DeltaFile
+1-1release/Makefile.vm
+1-11 files

FreeBSD/src 65840af — release Makefile.ec2

EC2: Pass --vmdk to bsdec2-image-upload if needed

Starting with version 1.5.0, bsdec2-image-upload supports uploading
stream-optimized VMDK files.  If we build images in that format, we
need to upload them appropriately.

MFC after:      2 weeks
Sponsored by:   Amazon
DeltaFile
+4-1release/Makefile.ec2
+4-11 files

FreeBSD/src 9a0b9a2 — usr.bin/mkimg Makefile vmdk.c

mkimg: Add support for stream-optimized VMDK

FreeBSD VM/cloud images tend to be highly compressible: The generic VM
images compress roughly 3.5:1, and cloud images typically even more
since they have significant unused space in their virtual disks.  This
generally doesn't matter for users who can download compressed release
images and extract them locally, but for EC2 in particular relying on
uncompressed image formats is painful: We now upload over 500 GB/week
to AWS.

This commit adds the "stream-optimized" version of the VMDK format,
which compresses each 64 kB "grain" individually (and omits grains
which are all zeroes).  Compared to uncompressed formats, this can
produce much smaller images; experiments indicate that using this
format for EC2 image uploads will reduce the weekly traffic to under
100 GB/week.

Co-authored-by: Claude Opus 5.5
MFC after:      2 weeks

    [2 lines not shown]
DeltaFile
+309-0usr.bin/mkimg/vmdk.c
+1-1usr.bin/mkimg/Makefile
+310-12 files

FreeBSD/src a68ba2d — . Makefile.inc1, sys/sys param.h

__FreeBSD_version: Bump for mkimg -f vmdks

Also, adjust bootstrap tools code in Makefile.inc1 to reflect this; in
addition to rebuilding mkimg if it is out of date, we now need to build
libz, which was not previously needed by mkimg.

Reviewed by:    kevans
MFC after:      2 weeks
Sponsored by:   Amazon
Differential Revision:  https://reviews.freebsd.org/D60153
DeltaFile
+4-3Makefile.inc1
+1-1sys/sys/param.h
+5-42 files

FreeBSD/src 88017d3 — usr.bin/mkimg mkimg.1

mkimg.1: Document new vmdks format

Reviewed by:    ziaee
Co-authored-by: Claude Opus 5.5
MFC after:      2 weeks
Sponsored by:   Amazon
Differential Revision:  https://reviews.freebsd.org/D60152
DeltaFile
+12-2usr.bin/mkimg/mkimg.1
+12-21 files

FreeBSD/src 65b8723 — usr.bin/mkimg/tests img-63x255-512-mbr.vmdks.hex img-63x255-512-ebr.vmdks.hex

mkimg: Add tests for vmdks format

This is the 'stream-optimized' version of the VMDK format.

MFC after:      2 weeks
Sponsored by:   Amazon
Differential Revision:  https://reviews.freebsd.org/D60154
DeltaFile
+617-0usr.bin/mkimg/tests/img-1x1-512-gpt.vmdks.hex
+617-0usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdks.hex
+617-0usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdks.hex
+617-0usr.bin/mkimg/tests/img-63x255-512-gpt.vmdks.hex
+596-0usr.bin/mkimg/tests/img-63x255-512-mbr.vmdks.hex
+596-0usr.bin/mkimg/tests/img-63x255-512-ebr.vmdks.hex
+3,660-015 files not shown
+11,963-121 files

FreeBSD/src 498276b — usr.bin/mkimg vmdk.c

mkimg: Make vmdk's desc_fmt slightly more generic

This will allow it to be reused in upcoming work.

Suggested by:   Claude Opus 5.5
MFC after:      2 weeks
Sponsored by:   Amazon
Differential Revision:  https://reviews.freebsd.org/D60150
DeltaFile
+6-3usr.bin/mkimg/vmdk.c
+6-31 files

FreeBSD/src 84a3e29 — usr.bin/mkimg image.h image.c

mkimg: Add image_buffer_region

This is like image_copyout_region, but copies into a buffer rather than
writing out to a file; it will be used by future support for compressed
images (and potentially other circumstances where image data must be
manipulated before being written out to disk).

Reviewed by:    jrm
No objection from:      Christos Komis (author)
MFC after:      2 weeks
Sponsored by:   Google LLC (GSoC 2025)
Differential Revision:  https://reviews.freebsd.org/D60149
DeltaFile
+68-0usr.bin/mkimg/image.c
+1-0usr.bin/mkimg/image.h
+69-02 files

FreeBSD/src 1a05231 — usr.bin/mkimg vmdk.c

mkimg: Check for realloc failure

If realloc fails, clean up and return ENOMEM; don't just copy data
into NULL.

Reviewed by:    emaste
Reported by:    Claude Opus 5.5
MFC after:      2 weeks
Sponsored by:   Amazon
Differential Revision:  https://reviews.freebsd.org/D60147
DeltaFile
+6-1usr.bin/mkimg/vmdk.c
+6-11 files

FreeBSD/src 434819b — usr.bin/mkimg image.c

mkimg: Avoid leaking a page of mmap

The image_file_map function adjusts the provided file offset to be
page-aligned, with a resulting increase in the size of the mapped
region; the increased size needs to be used when unmapping as well.

Reported by:    Claude Opus 5.5
Fixes:  baf4abfc39b2 ("Allow building mkimg as cross-tool")
MFC after:      2 weeks
Sponsored by:   Amazon
Differential Revision:  https://reviews.freebsd.org/D60148
DeltaFile
+5-4usr.bin/mkimg/image.c
+5-41 files

FreeBSD/src 40f4174 — usr.sbin/jail config.c

jail(8): Preserve const qualifier on strchr(3) results

Reviewed by:    fuz, dteske
Approved by:    fuz (mentor), dteske (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59876

(cherry picked from commit ab636e421d318a1175450d5652d8460dd2c48b76)
DeltaFile
+3-3usr.sbin/jail/config.c
+3-31 files

FreeBSD/src ad60cb1 — usr.sbin/pkg pkg.c

pkg(7): Preserve const qualifier on strrchr(3) results

Reviewed by:    fuz
Approved by:    fuz (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59777

(cherry picked from commit 47f9e665078210cf15cc3914611dccabda6084a4)
DeltaFile
+2-2usr.sbin/pkg/pkg.c
+2-21 files

FreeBSD/src 3b8ba87 — bin/ls print.c

ls(1): Preserve const qualifier on strstr(3) result

Reviewed by:    fuz
Approved by:    fuz (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59774

(cherry picked from commit cc61cc7b638a6a1182c0dd0989a7b630759f408c)
DeltaFile
+2-2bin/ls/print.c
+2-21 files

FreeBSD/src a8fcc58 — bin/ed io.c

ed(1): Preserve const qualifier on strchr(3) result

Reviewed by:    fuz
Approved by:    fuz (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59773

(cherry picked from commit 066fad8aefcb5bda77482c526757712ad0637aa9)
DeltaFile
+1-1bin/ed/io.c
+1-11 files

FreeBSD/src 850a848 — bin/dd args.c

dd(1): Preserve const qualifier on bsearch(3) results

Reviewed by:    fuz, dteske
Approved by:    fuz (mentor), dteske (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59754

(cherry picked from commit 225612c76d870aa6467853fbafcbe34e8296d0d9)
DeltaFile
+9-5bin/dd/args.c
+9-51 files

FreeBSD/src 536b344 — sbin/devmatch devmatch.c

devmatch(8): Preserve const qualifier on strchr(3) and strstr(3) results

Reviewed by:    fuz, dteske
Approved by:    fuz (mentor), dteske (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59667

(cherry picked from commit 592ae60e2b2eff6c2ec467c34be9a457ce24b044)
DeltaFile
+4-3sbin/devmatch/devmatch.c
+4-31 files

FreeBSD/src 9c18454 — bin/ps ps.c

ps(1): Preserve const qualifier on strchr(3) result

Reviewed by:    fuz, dteske
Approved by:    fuz (mentor), dteske (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59666

(cherry picked from commit d10e39d489a63cc034a1250d33e39743058639c2)
DeltaFile
+2-1bin/ps/ps.c
+2-11 files

FreeBSD/src 64df13d — lib/libjail jail.c

libjail: Preserve const qualifier on strchr(3) and strrchr(3) results

Reviewed by:    fuz
Approved by:    fuz (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59553

(cherry picked from commit c63b69f82a745c1b905c1050eeff9df96fe18f4c)
DeltaFile
+6-4lib/libjail/jail.c
+6-41 files

FreeBSD/src 8b360b4 — release/scripts make-oci-image.sh, release/tools oci-image-runtime.conf

release: Avoid generating .pkgsave files in OCI images

This also installs the pkg key from the current source tree instead of
using the one currently installed on the host.

Reviewed by:            dch
MFC after:              1 day
Differential Revision:  https://reviews.freebsd.org/D52615

(cherry picked from commit e21e6e96b662dcbb2f0e37ab356c9dded62a586e)
DeltaFile
+9-1release/scripts/make-oci-image.sh
+4-0release/tools/oci-image-runtime.conf
+13-12 files

FreeBSD/src 7656159 — sys/dev/virtio/console virtio_console.h virtio_console.c

virtio_console: Handle VIRTIO_CONSOLE_RESIZE

Multiport devices report console size per port by control event,
which was ignored and hence their ttys could never have a window
size.

Reviewed by:    markj
Approved by:    fuz (mentor)
Differential Revision:  https://reviews.freebsd.org/D60094
DeltaFile
+38-0sys/dev/virtio/console/virtio_console.c
+5-0sys/dev/virtio/console/virtio_console.h
+43-02 files

FreeBSD/src 15198bf — sys/dev/virtio/console virtio_console.c, sys/dev/virtio/network if_vtnet.c

virtio: Validate host-supplied used lengths

virtio_console used the host-supplied used lengths without
validation, so a host could report a length larger than
the buffer, causing the receive and control paths to read
past the end of it.  Clamp to the buffer size.

vtnet already rejected used lengths larger than the buffer,
but performed the check after converting the length to an
int, so a length larger than INT_MAX would become negative
and bypass the check.  Reject such frames early before the
conversion, and count them in ierrors and rx_frame_too_large.

Reviewed by:    markj
Approved by:    fuz (mentor)
Differential Revision:  https://reviews.freebsd.org/D60092
DeltaFile
+4-1sys/dev/virtio/network/if_vtnet.c
+2-0sys/dev/virtio/console/virtio_console.c
+6-12 files

FreeBSD/src 9c8dcc2 — sys/dev/virtio/console virtio_console.c

virtio_console: Negotiate VIRTIO_CONSOLE_F_SIZE

The driver reads cols/rows and sets the tty window size but
never offered the feature, so that code has been dead since
the very beginning; also read size under the configuration
generation count.

Reviewed by:    markj
Approved by:    fuz (mentor)
Differential Revision:  https://reviews.freebsd.org/D60089
DeltaFile
+12-5sys/dev/virtio/console/virtio_console.c
+12-51 files

FreeBSD/src fe9c713 — contrib/llvm-project/clang/lib/Sema SemaTemplateInstantiateDecl.cpp

Merge commit c4ce37507537 from llvm-project (by ShengYi Hung):

  [Clang][Sema] Create LocalScope for Variable Template (#228280)

  A variable template should create its own LocalScope, as it should be
  opaque to other instantiations. This can occur when there are multiple
  instantiations in the same lexical scope. The correct behavior is that
  these instantiations should not be chained together.

  Assisted-by: Claude # Test ReleaseNote
  Fixes: #134148

This fixes an assertion while building the devel/glaze port.

PR:             276265
MFC after:      3 days
DeltaFile
+4-0contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+4-01 files

FreeBSD/src 2300c23 — sys/dev/vt/hw/fb vt_fb.c

vt_fb: Do not perform VT switch in vd_init hook

After 40c20fc29cad it is done by vt_core as soon as vt lock is dropped
after vd_init() has been executed to avoid sleeping with non-sleepable
lock held.

Reviewed by:    quentin.thebault_defenso.fr, vexeduxr
Differential Revision:  https://reviews.freebsd.org/D59632
DeltaFile
+0-3sys/dev/vt/hw/fb/vt_fb.c
+0-31 files

FreeBSD/src 4c46d1a — usr.sbin/bhyveload bhyveload.c

bhyveload: do not hang on EOF from console input

Currently, when bhyveload(8) fails to boot the guest,
it drops into the loader prompt waiting for user input.

This behaviour is inconvenient when using bhyveload(8) from
scripts.

Make it exit when it receives EOF from console input.

PR:             286289
Reviewed by:    markj
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59226

(cherry picked from commit 8c20260bc55d7b4be0cbcf0a940505ae15ab41a9)
DeltaFile
+5-1usr.sbin/bhyveload/bhyveload.c
+5-11 files

FreeBSD/src 49276e4 — usr.sbin/bhyveload bhyveload.c

bhyveload: do not hang on EOF from console input

Currently, when bhyveload(8) fails to boot the guest,
it drops into the loader prompt waiting for user input.

This behaviour is inconvenient when using bhyveload(8) from
scripts.

Make it exit when it receives EOF from console input.

PR:             286289
Reviewed by:    markj
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59226

(cherry picked from commit 8c20260bc55d7b4be0cbcf0a940505ae15ab41a9)
DeltaFile
+5-1usr.sbin/bhyveload/bhyveload.c
+5-11 files

FreeBSD/src ff2efe6 — usr.sbin/bhyve bhyve.8

bhyve.8: add details on using TPM with UEFI

Add a note that UEFI VMs using TPM devices should be configured
to use a varfile. Some UEFI boot loaders, such as shim, update
persistent boot variables and then reset the system when a TPM is
present. Without a writable varfile, the VM may be reset repeatedly.

Add a TPM device example to the examples list.

While here, add a missing "\" to the "uefivm" example, and add ".Pp"
before the vCPU pinning examples for consistency with other examples.

PR:             287326
Reviewed by:    michaelo, ziaee
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D60181
DeltaFile
+30-2usr.sbin/bhyve/bhyve.8
+30-21 files

FreeBSD/src 7b8c805 — contrib/tzdata zone1970.tab zone.tab

contrib/tzdata: import tzdata 2026e

Changes: https://github.com/eggert/tz/blob/2026e/NEWS

Briefly:
    Manitoba moves to permanent -05 on 2026-10-31.

(cherry picked from commit f11af6535044c8266d52806d72b07e939f94049c)
DeltaFile
+98-20contrib/tzdata/northamerica
+38-0contrib/tzdata/NEWS
+26-4contrib/tzdata/europe
+4-1contrib/tzdata/zonenow.tab
+1-1contrib/tzdata/zone1970.tab
+1-1contrib/tzdata/zone.tab
+168-273 files not shown
+171-309 files

FreeBSD/src 961a842 — contrib/tzdata zone1970.tab zone.tab

contrib/tzdata: import tzdata 2026e

Changes: https://github.com/eggert/tz/blob/2026e/NEWS

Briefly:
    Manitoba moves to permanent -05 on 2026-10-31.

(cherry picked from commit f11af6535044c8266d52806d72b07e939f94049c)
DeltaFile
+98-20contrib/tzdata/northamerica
+38-0contrib/tzdata/NEWS
+26-4contrib/tzdata/europe
+4-1contrib/tzdata/zonenow.tab
+1-1contrib/tzdata/zone1970.tab
+1-1contrib/tzdata/zone.tab
+168-273 files not shown
+171-309 files

FreeBSD/src d9e2cac — sys/kern subr_witness.c

jail: note existing process/prison lock order in witness.
DeltaFile
+7-0sys/kern/subr_witness.c
+7-01 files