BSD Commit Log Search

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Merge branch 'freebsd/current/main' into hardened/current/master

cuse(3): annotate cuse_init() to suppress thread safety analysis

This avoids warnings from clang 21, similar to:

    /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis]
      111 |         TAILQ_INIT(&h_cuse);
          |                     ^
    /usr/src/lib/libcuse/cuse_lib.c:111:14: error: writing variable 'h_cuse' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis]
    /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis]
      112 |         TAILQ_INIT(&h_cuse_entered);
          |                     ^
    /usr/src/lib/libcuse/cuse_lib.c:112:14: error: writing variable 'h_cuse_entered' requires holding mutex 'm_cuse' exclusively [-Werror,-Wthread-safety-analysis]

MFC after:      3 days

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main

zfs: merge openzfs/zfs at 743334913 (zfs-2.4-release) into stable/15

OpenZFS 2.4.0

Notable upstream pull request merges:
 #17932 c8ecd63ac zpool: fix special vdev -v -o conflict
 #17941 74bbdda1e Fix snapshot automount expiry cancellation deadlock
 #17946 f45622ff4 chksum: run 256K benchmark on demand, preserve
                  chksum_stat_data
 #17960 a41ef3685 DDT: Reduce global DDT lock scope during writes
 #17961 2aad3dee2 DDT: Make children writes inherit allocator
 #17975 2e09f166f FreeBSD: Fix uninitialized variable error
 #17980 a785ddc5f DDT: Switch to using wmsums for lookup stats
 #17983 028d66b9d Fix ddtprune causing space leak
 #18004 e1f0baa54 FreeBSD: Remove HAVE_INLINE_FLSL use
 #18015 a2f768f61 FreeBSD: Fix a potential null dereference in
                  zfs_freebsd_fsync() (already merged)

Obtained from:  OpenZFS

    [2 lines not shown]

LinuxKPI: bump __FreeBSD_version for vmap_pfn implementation

LinuxKPI: Implement vmap_pfn

Required by i915kms to support recent discrete graphics cards.

MFC after:      1 week
Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D54225

(cherry picked from commit df49fd8efa1a885089488458df0e7e88c9649c90)

LinuxKPI: Move vmap-related code from linux_compat.c to linux_page.c

Coming vmap_pfn() implementation requires is_vmalloc_addr() to be in
the same file with other vmap-related code. Move code out from the
overcrowded file. No functional changes intended.

MFC after:      1 week
Reviewed by:    bz
Differential Revision:  https://reviews.freebsd.org/D54223

(cherry picked from commit 20ce906157dfc9ae6ee834f56f2bba154f37d653)

Merge branch 'freebsd/current/main-merge-2025-12-24' into hardened/current/master

Revert "src.conf: Add WITH_LLVM_LINK_STATIC_LIBRARIES build knob"

This reverts commit 8d5a11cd0137d3ad70f6b06e063ea91a776d510a. We only
support statically-built llvm in HardenedBSD base.

Signed-off-by: Shawn Webb <shawn.webb at hardenedbsd.org>

Revert "OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases"

This reverts commit 160077a4d75186a979f28f0778259c66d8cac8be. We only
support statically-built llvm in HardenedBSD base.

Signed-off-by: Shawn Webb <shawn.webb at hardenedbsd.org>

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main

bsd-family-tree: add FreeBSD 15.0

(cherry picked from commit 7b44ab1c6abe106a44604a8504edca0e57ec1c42)

Sponsored by:   tipi.work

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

(cherry picked from commit 1821cf482ff128b08bd65807e1f7aad7eb873e0b)

bsd-family-tree: add macOS 26

Sponsored by:   tipi.work

(cherry picked from commit c6e02892bbca1237546e3943c0971768822e1745)

bsd-family-tree: add FreeBSD 15.0

(cherry picked from commit 7b44ab1c6abe106a44604a8504edca0e57ec1c42)

Sponsored by:   tipi.work

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

(cherry picked from commit 1821cf482ff128b08bd65807e1f7aad7eb873e0b)

nfsd.8: Add a short paragraph w.r.t. NFSv3 vs NFSv4 setup

The nfsd can be configured to support NFSv3, NFSv4 or both
of them.

This patch adds a short paragraph to nfsd.8 to explain this.

This is a content change.

Reviewed by:    kib, zaiee (manpages)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54279

bsd-family-tree: add macOS 26

Sponsored by:   tipi.work

(cherry picked from commit c6e02892bbca1237546e3943c0971768822e1745)

OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases

In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES
src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc.

However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES
is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and
libprivatelldb.so.19 should always be cleaned up.

Fixes:          cf1eaaf41cef
MFC after:      1 week

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main

unionfs: Support renaming symbolic links

This adds support for renaming a symbolic link found on the lower fs,
which necessitates copying it to the upper fs, as well as basic tests.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    olce, siderop1_netapp.com, jah
Differential Revision:  https://reviews.freebsd.org/D54229

(cherry picked from commit a678e87f5533521f6dec1a4e85c3decb1c3b6584)

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main

devfs: make destroy_dev() a release barrier for cdevpriv destructors runs

(cherry picked from commit 4dbe6628179d8e6bf400bfdb4bfa869bdc102a56)

vm_fault_trap(): fix comments grammar

(cherry picked from commit 95788a851deb33242c18beb47f8a79eec320dfa5)

swap_pager_seek_data(): move the clipping at the object size to consumers

(cherry picked from commit 30ae88e3b217b12476dba665d163ab0d8dd6a8a7)

swap_pager_seek_data(): improve assertions

(cherry picked from commit bdfd695037a95b076aeffd04ed9fdf042b6ce218)