FreeBSD/src 3857960usr.sbin/utx utx.8

utx.8: protect first name "Ed"

For some people "Ed" is a first name, but for mandoc it is a
macro (end of display block) and needs to be escaped.
DeltaFile
+1-1usr.sbin/utx/utx.8
+1-11 files

FreeBSD/src ba6c676share/man/man4 hifn.4, sys/dev/hifn hifn7751.c

hifn(4): add gone_in 16.0
DeltaFile
+6-1share/man/man4/hifn.4
+3-0sys/dev/hifn/hifn7751.c
+9-12 files

FreeBSD/src 0ef2ecdshare/man/man4 safe.4, sys/dev/safe safe.c

safe(4): add gone_in 16.0

Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D53426
(cherry picked from commit 9b7d2cee03e5d0b0723718047d4bc388d0745591)
DeltaFile
+15-1share/man/man4/safe.4
+2-0sys/dev/safe/safe.c
+17-12 files

FreeBSD/src e224f2csys/dev/random random_harvestq.c, sys/dev/random/fenestrasX fx_pool.c

random: Have RANDOM_PURE_START be a cross-platform source

and one that will be with us in the long-term future.
(this helps reduce diffs in the future and for down-stream users
that trim entropy sources).  Also, move deprecated (removed in 16.0)
sources to the bottom of the list to reduce changes to 15.x.

Reviewed by:    glebius
Obtained from:  Juniper Networks
Differential Revision:  https://reviews.freebsd.org/D53311
(cherry picked from commit 9f3886347c1750cf80a82314470fc7186088eb9a)
DeltaFile
+10-10sys/dev/random/fenestrasX/fx_pool.c
+4-4sys/sys/random.h
+4-4sys/dev/random/random_harvestq.c
+18-183 files

FreeBSD/src fdd30e0sys/fs/msdosfs msdosfs_vnops.c, sys/kern vfs_default.c

pathconf: Define a new name called _PC_CASE_INSENSITIVE

Some FreeBSD file systems (msdosfs and optionally ZFS)
handle case insensitive file name lookup.
NFS (v3 and 4) provide an attribute to indicate this
capability, but without this patch, the NFS server does
not know if the file system does support this.

This patch adds the pathconf name_PC_CASE_INSENSITIVE
that can be used by the NFS server or user programs to
check for this feature.

(cherry picked from commit d6864221d88425a079f76ca106f30812c671ca9a)
DeltaFile
+3-0sys/fs/msdosfs/msdosfs_vnops.c
+1-0sys/sys/unistd.h
+1-0sys/kern/vfs_default.c
+5-03 files

FreeBSD/src 911f2a5sys/dev/usb usbdevs, sys/dev/usb/serial u3g.c

Add support for Sierra Wireless EM7590 modem.

PR: 290421
MFC After: 3 days

(cherry picked from commit 00ebecd4a09db84fb6c5002b082400d8f8a97407)
DeltaFile
+1-0sys/dev/usb/serial/u3g.c
+1-0sys/dev/usb/usbdevs
+2-02 files

FreeBSD/src 81a5e32sys/dev/usb usbdevs, sys/dev/usb/serial u3g.c

usb/u3g: add Quectel EM060K

PR: 290688
MFC After: 3 days

(cherry picked from commit 6968897a8048aee2c72efdfbe23a7b64bdebcdbc)
DeltaFile
+1-0sys/dev/usb/serial/u3g.c
+1-0sys/dev/usb/usbdevs
+2-02 files

FreeBSD/src 068fea0sys/dev/random random_harvestq.c, sys/dev/random/fenestrasX fx_pool.c

random: Have RANDOM_PURE_START be a cross-platform source

and one that will be with us in the long-term future.
(this helps reduce diffs in the future and for down-stream users
that trim entropy sources).  Also, move deprecated (removed in 16.0)
sources to the bottom of the list to reduce changes to 15.x.

Reviewed by:    glebius
Obtained from:  Juniper Networks
Differential Revision:  https://reviews.freebsd.org/D53311
DeltaFile
+7-7sys/dev/random/fenestrasX/fx_pool.c
+3-3sys/dev/random/random_harvestq.c
+3-3sys/sys/random.h
+13-133 files

FreeBSD/src 4f19c2esys/dev/safe safe.c

safe(4): fix api used

Fixes: 9b7d2cee
DeltaFile
+1-1sys/dev/safe/safe.c
+1-11 files

FreeBSD/src db160ddsys/dev/usb usbdevs, sys/dev/usb/serial u3g.c

usb/u3g: add Quectel EM060K

PR: 290688
MFC After: 3 days

(cherry picked from commit 6968897a8048aee2c72efdfbe23a7b64bdebcdbc)
DeltaFile
+1-0sys/dev/usb/serial/u3g.c
+1-0sys/dev/usb/usbdevs
+2-02 files

FreeBSD/src 121e7eesys/dev/usb usbdevs, sys/dev/usb/serial u3g.c

Add support for Sierra Wireless EM7590 modem.

PR: 290421
MFC After: 3 days

(cherry picked from commit 00ebecd4a09db84fb6c5002b082400d8f8a97407)
DeltaFile
+1-0sys/dev/usb/serial/u3g.c
+1-0sys/dev/usb/usbdevs
+2-02 files

FreeBSD/src 69c726csys/dev/virtio virtqueue.c

virtio: Fix polling in virtqueue_dequeue()

The access of vq->vq_ring.used->idx needs to be volatile-qualified,
otherwise the compiler may optimize virtqueue_poll() into an infinite
loop if there is no data available upon the first poll.

Prior to commit ad17789a8569 this wasn't a problem since an external
function call after each poll inhibited the optimization.

Approved by:    re (cperciva)
PR:             289930
MFC after:      3 days
Sponsored by:   Klara, Inc.
Fixes:          ad17789a8569 ("virtio: Remove the unused poll method")

(cherry picked from commit f999ffdce3813eb946f10999ccffb8275c324469)
(cherry picked from commit 72c76047541ab6cc0e989a74e8de4d6e6a1a94b6)
DeltaFile
+2-1sys/dev/virtio/virtqueue.c
+2-11 files

FreeBSD/src f89aa18release Makefile

release: Add WITHOUT_QEMU to IMAKE

We have NO_ROOT here, so we need WITHOUT_QEMU to avoid problems.

15.0 candidate.

Reviewed by:    emaste, markj
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53637
DeltaFile
+1-1release/Makefile
+1-11 files

FreeBSD/src f9e79fabin/sh parser.c, bin/sh/tests/parser ps2-expand1.0 ps1-expand5.0

sh: Implement simple parameter expansion in PS1 and PS2

This change follows a localized approach within getprompt() and avoids
full parser reentry. While this means we don't support advanced
expansions like ${parameter#pattern}, it provides POSIX-compliant basic
parameter expansion without the complexity of making the parser
reentrant. This is sufficient for the vast majority of use cases.

PR:             46441
DeltaFile
+125-1bin/sh/parser.c
+12-0bin/sh/tests/parser/ps2-expand1.0
+8-0bin/sh/tests/parser/ps1-expand5.0
+8-0bin/sh/tests/parser/ps1-expand4.0
+8-0bin/sh/tests/parser/ps1-expand3.0
+7-0bin/sh/tests/parser/ps1-expand2.0
+168-12 files not shown
+181-18 files

FreeBSD/src 1772049contrib/llvm-project/clang/lib/Driver/ToolChains FreeBSD.h

Revert "Merge commit e24f90190c77 from llvm git (by Brad Smith):"

    [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089)

The compiler_rt helper functions have been built since 12.4, 13.1, 14
and anything newer.

This reverts commit 51e8e8b0f36933814b1be08913857727876aece5.

MFC after:      immediately

(cherry picked from commit bd27bd1f51d049538cc7a0053be9d99110a53ae1)
DeltaFile
+0-5contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h
+0-51 files

FreeBSD/src 9b7d2ceshare/man/man4 safe.4, sys/dev/safe safe.c

safe(4): add gone_in 16.0

Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D53426
DeltaFile
+15-1share/man/man4/safe.4
+2-0sys/dev/safe/safe.c
+17-12 files

FreeBSD/src 1821cf4share/misc bsd-family-tree

bsd-family-tree: Re-center OpenBSD line

Commit 09aeca28dd75 ("BSD family tree: reduce OpenBSD-NetBSD crowding")
moved OpenBSD releases over 2 spaces.  Move the line through OpenBSD
releases over as well.

Reviewed by:    obrien
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53635
DeltaFile
+344-344share/misc/bsd-family-tree
+344-3441 files

FreeBSD/src 9c90145sys/net if_vxlan.c

if_vxlan: fix byteorder of source port

Fix the htons byteorder of vxlan packets after
`vxlan_pick_source_port` picks a source port during encapsulation.

Reviewed by:    zlei, kp, adrian
Differential Revision:  https://reviews.freebsd.org/D53022

(cherry picked from commit 1cc316727ebae157b3d035d9fb1ad38310a80698)
DeltaFile
+2-2sys/net/if_vxlan.c
+2-21 files

FreeBSD/src 8caf467share/man/man4 mpr.4

mpr.4: Remove Broadcom LSI 3908 from support list

"This one is my fault due to incorrect merging" ~ziaee

MFC after:              3 days
Reviewed by:            ziaee
Fixes:                  744c8d554453 (mpr.4: Add Broadcom LSI 3808)
Differential Revision:  https://reviews.freebsd.org/D53634
DeltaFile
+0-2share/man/man4/mpr.4
+0-21 files

FreeBSD/src d599034usr.sbin/jail jail.8

jail.8: Add creating a jail from distribution set

PR:                     200803
MFC after:              3 days
Reviewed by:            jamie
Differential Revision:  https://reviews.freebsd.org/D53631
DeltaFile
+17-3usr.sbin/jail/jail.8
+17-31 files

FreeBSD/src 5d55553bin/sh/tests/builtins read11.0

sh tests: Fix racy test11.0

This was sometimes exiting while the child fifo was created resulting in
[ENOTEMPTY] from rm.  The child fifo isn't needed, just sleep.

PR:     290837
Fixes:  e31fb97148f ("read builtin: Empty variables on timeout")
MFC after:      3 days
DeltaFile
+2-2bin/sh/tests/builtins/read11.0
+2-21 files

FreeBSD/src 17fb082sys/netinet tcp_syncache.c

tcp: improve comments in the syncache code

Add a comment explaining why syncache entries are dropped and fix a
typo in a comment.

Reviewed by:            rrs, glebius
MFC after:              3 days
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D53564
DeltaFile
+12-1sys/netinet/tcp_syncache.c
+12-11 files

FreeBSD/src 300a897sys/amd64/include vmm.h, sys/amd64/vmm vmm.c

vmm: Fix a deadlock between vm_smp_rendezvous() and vcpu_lock_all()

vm_smp_rendezvous() invokes a callback on all vCPUs, blocking the
initiator until all vCPUs have responded.  vcpu_lock_all() blocks each
vCPU by waiting for it to go idle and setting the vCPU state to frozen.
These two operations can deadlock on each other, particularly when
booting a Windows guest, when vcpu_lock_all() blocks waiting for a
rendezvous initiator, and the initiator is blocked waiting for the vCPU
thread which called vcpu_lock_all() to invoke the rendezvous callback.

Implement vcpu_lock_all() in a way that avoids deadlocks with
vm_smp_rendezvous().  In particular, when traversing vCPUs, invoke the
rendezvous callback on the vCPU's behalf to help the initiator finish.
We can only safely do so when the vCPU is IDLE or we have already locked
it, otherwise we may be racing with the target vCPU thread.  Thus:
- Use an exclusive lock to serialize vcpu_lock_all() callers, which lets
  us lock vCPUs out of order without fear of deadlock with parallel
  vcpu_lock_all() callers.
- If a rendezvous is pending, lock all idle vCPUs and invoke the

    [16 lines not shown]
DeltaFile
+148-29sys/amd64/vmm/vmm.c
+22-6sys/dev/vmm/vmm_dev.c
+2-2sys/riscv/vmm/vmm.c
+2-2sys/arm64/vmm/vmm.c
+2-1sys/amd64/include/vmm.h
+1-1sys/riscv/include/vmm.h
+177-411 files not shown
+178-427 files

FreeBSD/src 129ceddsys/riscv/vmm vmm_aplic.c vmm.c

riscv/vmm: Remove a redundant maxcpu check in vm_alloc_vcpu()

aplic_max_cpu_count() just returns the VM's max vCPU count, and
vm_alloc_vcpu() already checks that.  Just remove this check so that
it's easier to merge vm_alloc_vcpu() into MI code.

If the APLIC really does require us to lower the limit, we should
instead adjust vm->maxcpu in vm_create().

No functional change intended.

Reviewed by:    br
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D53496

(cherry picked from commit 5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5)
DeltaFile
+0-10sys/riscv/vmm/vmm_aplic.c
+0-4sys/riscv/vmm/vmm.c
+0-1sys/riscv/vmm/vmm_aplic.h
+0-153 files

FreeBSD/src 72c7604sys/dev/virtio virtqueue.c

virtio: Fix polling in virtqueue_dequeue()

The access of vq->vq_ring.used->idx needs to be volatile-qualified,
otherwise the compiler may optimize virtqueue_poll() into an infinite
loop if there is no data available upon the first poll.

Prior to commit ad17789a8569 this wasn't a problem since an external
function call after each poll inhibited the optimization.

PR:             289930
MFC after:      3 days
Sponsored by:   Klara, Inc.
Fixes:          ad17789a8569 ("virtio: Remove the unused poll method")

(cherry picked from commit f999ffdce3813eb946f10999ccffb8275c324469)
DeltaFile
+2-1sys/dev/virtio/virtqueue.c
+2-11 files

FreeBSD/src a432ffbsys/net if_vxlan.c

if_vxlan: fix byteorder of source port

Fix the htons byteorder of vxlan packets after
`vxlan_pick_source_port` picks a source port during encapsulation.

Reviewed by:    zlei, kp, adrian
Differential Revision:  https://reviews.freebsd.org/D53022

(cherry picked from commit 1cc316727ebae157b3d035d9fb1ad38310a80698)
DeltaFile
+2-2sys/net/if_vxlan.c
+2-21 files

FreeBSD/src a83a049sys/net if_vxlan.c

if_vxlan: fix byteorder of source port

Fix the htons byteorder of vxlan packets after
`vxlan_pick_source_port` picks a source port during encapsulation.

Reviewed by:    zlei, kp, adrian
Differential Revision:  https://reviews.freebsd.org/D53022

(cherry picked from commit 1cc316727ebae157b3d035d9fb1ad38310a80698)
DeltaFile
+2-2sys/net/if_vxlan.c
+2-21 files

FreeBSD/src 3447fc0lib/atf Makefile.inc, lib/atf/libatf-c++/tests Makefile

atf: Move the tests back to the tests package

Commit 9065390ddc7b moved atf to its own package, but mistakenly moved
the tests as well.  Put the tests back into the test package.

Approved by:    re (cperciva)
Fixes:  9065390ddc7b ("packages: Remove the tests-dev package")
MFC after:      1 day
Reviewed by:    emaste
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53594

(cherry picked from commit 4b342830abd39cdc20b67a215e15309293673e75)
(cherry picked from commit cdfa9139777189a16ea7a86c6457f169b76d7628)
DeltaFile
+3-0lib/atf/tests/Makefile
+3-0libexec/atf/tests/Makefile
+2-0lib/atf/libatf-c++/tests/Makefile
+1-1lib/atf/Makefile.inc
+2-0lib/atf/libatf-c++/tests/detail/Makefile
+2-0lib/atf/libatf-c/tests/Makefile
+13-13 files not shown
+18-29 files

FreeBSD/src 5bee2fdsecure/lib/libcrypto Makefile.inc

libcrypto: Install tests in the tests package

libcrypto's Makefile.inc used PACKAGE=openssl, which overrides the
PACKAGE=tests in libcrypto/tests/Makefile.  Use PACKAGE?=openssl
instead to avoid this.  This puts the OpenSSL tests in the tests
package where they belong.

Approved by:    re (cperciva)
MFC after:      1 day
Reviewed by:    manu, ngie
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53595

(cherry picked from commit c3b853fe522ead976863af086557be8863327eb0)
(cherry picked from commit 4e672f6ff005412365a0ef8b5fe0ca415e92146a)
DeltaFile
+1-1secure/lib/libcrypto/Makefile.inc
+1-11 files

FreeBSD/src 09aeca2share/misc bsd-family-tree

BSD family tree: reduce OpenBSD-NetBSD crowding

OpenBSD was nearly against the NetBSD entries, especially in their
earlier lineages.  Now line up "OpenBSD" with | at the 'e'.

Reviewed by:    gordon (in person)
Differential Revision:  https://reviews.freebsd.org/D53509
DeltaFile
+60-60share/misc/bsd-family-tree
+60-601 files