HardenedBSD/src 5631c44share/man/man9 vmem.9

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-0share/man/man9/vmem.9
+3-01 files

HardenedBSD/src 84a265dshare/man/man9 vmem.9

vmem.9: provide a reference to libuvmem(3)

(cherry picked from commit 5c1d9df10b78f8d2e13e16f5db2e4542f582aebd)
DeltaFile
+3-0share/man/man9/vmem.9
+3-01 files

HardenedBSD/src 5897f3fsys/netinet6 in6_ifattach.c, sys/powerpc/powerpc intr_machdep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-7sys/powerpc/powerpc/intr_machdep.c
+1-0sys/netinet6/in6_ifattach.c
+2-72 files

HardenedBSD/src 9f8ff72sys/netinet6 in6_ifattach.c, sys/powerpc/powerpc intr_machdep.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-7sys/powerpc/powerpc/intr_machdep.c
+1-0sys/netinet6/in6_ifattach.c
+2-72 files

HardenedBSD/src 117306dsys/netinet6 in6_ifattach.c

in6_ifattach: include sys/eventhandler.h to unbreak NOVIMAGE builds

LINT-NOVIMAGE fails to build due to a missing eventhandler.h include
which in hte VIMAGE case is likely leaked through some other header.
Add the #include to unbreak the build.

Fixes:  0d469d23715d6 (net: attach IPv4 and IPv6 stacks to an ...)
DeltaFile
+1-0sys/netinet6/in6_ifattach.c
+1-01 files

HardenedBSD/src 27cb261sys/powerpc/powerpc intr_machdep.c

powerpc/intr: Minor cleanup

Use MTX_SYSINIT() instead of rolling our own.
DeltaFile
+1-7sys/powerpc/powerpc/intr_machdep.c
+1-71 files

HardenedBSD/src d367b23usr.sbin/fwget/pci pci_video_amd

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+8-0usr.sbin/fwget/pci/pci_video_amd
+8-01 files

HardenedBSD/src 73b0861usr.sbin/fwget/pci pci_video_amd

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+8-0usr.sbin/fwget/pci/pci_video_amd
+8-01 files

HardenedBSD/src ec36760tests/ci Makefile, tests/ci/tools freebsdci

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+35-22tests/ci/tools/freebsdci
+42-1tests/ci/Makefile
+77-232 files

HardenedBSD/src dd5a48fusr.sbin/fwget/pci pci_video_amd

fwget: Add Navi 33 support

Tested on a RX7600

MFC After:      3 days
DeltaFile
+8-0usr.sbin/fwget/pci/pci_video_amd
+8-01 files

HardenedBSD/src f954e59tests/ci Makefile, tests/ci/tools freebsdci

tests/ci: Collect environment information

For reproducing errors or test results it is important to gather
environment information. These environments are divided into two parts.
One part is in which environment the artifacts were built into and the
second part is in which environment the tests were run.

This patch collects thesee information and saves into a .env file in
the metadir. After this patch lands we will also need to change our
jenkins job where we are uploading the artifact to a central location.
This environment file should also be stored along with the artifact.
For easier location the image basename and the environment basename are
kept same.

Approved by:    lwhsu
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D54247

(cherry picked from commit 14d5c13a89269862b51ef2a7f190b0d28cfbf8a2)
DeltaFile
+35-22tests/ci/tools/freebsdci
+42-1tests/ci/Makefile
+77-232 files

HardenedBSD/src 97737f9contrib/mtree create.c mtree.8, contrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+37-9contrib/mtree/spec.c
+25-16contrib/mtree/compare.c
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+10-10contrib/mtree/crc.c
+279-1515 files not shown
+312-17011 files

HardenedBSD/src 1e1ad0econtrib/mtree create.c mtree.8, contrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+37-9contrib/mtree/spec.c
+25-16contrib/mtree/compare.c
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+10-10contrib/mtree/crc.c
+279-1515 files not shown
+312-17011 files

HardenedBSD/src 7cc0266contrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

mtree: tests: Import NetBSD's mtree test suite

Manually import latest mtree test suite from NetBSD.

MFC after:      1 week

(cherry picked from commit 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d)
DeltaFile
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+39-11 files

HardenedBSD/src 12aa5ffcontrib/mtree compare.c spec.c

mtree: Fix typos

Manually apply a typo fix.  This change has already been submitted
upstream as bin/59824.

MFC after:      1 week

(cherry picked from commit dab5daf54cc26aaf2679a2eda5f378461f279ec5)
DeltaFile
+1-1contrib/mtree/compare.c
+1-1contrib/mtree/spec.c
+2-22 files

HardenedBSD/src ecc2e2econtrib/mtree create.c mtree.8

Import latest mtree from NetBSD

Merge commit 'f600477feb4ae61a75f61949eb600caff4aeea8c'

MFC after:      1 week
Discussed with: brooks

(cherry picked from commit 49b6dda4d71175ad615718401573be5fd024822b)
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+36-8contrib/mtree/spec.c
+24-15contrib/mtree/compare.c
+10-10contrib/mtree/crc.c
+12-5contrib/mtree/verify.c
+250-1534 files not shown
+271-16710 files

HardenedBSD/src 9bbfffecontrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

mtree: tests: Import NetBSD's mtree test suite

Manually import latest mtree test suite from NetBSD.

MFC after:      1 week

(cherry picked from commit 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d)
DeltaFile
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+39-11 files

HardenedBSD/src 97984decontrib/mtree compare.c spec.c

mtree: Fix typos

Manually apply a typo fix.  This change has already been submitted
upstream as bin/59824.

MFC after:      1 week

(cherry picked from commit dab5daf54cc26aaf2679a2eda5f378461f279ec5)
DeltaFile
+1-1contrib/mtree/compare.c
+1-1contrib/mtree/spec.c
+2-22 files

HardenedBSD/src f6fb1f8contrib/mtree create.c mtree.8

Import latest mtree from NetBSD

Merge commit 'f600477feb4ae61a75f61949eb600caff4aeea8c'

MFC after:      1 week
Discussed with: brooks

(cherry picked from commit 49b6dda4d71175ad615718401573be5fd024822b)
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+36-8contrib/mtree/spec.c
+24-15contrib/mtree/compare.c
+10-10contrib/mtree/crc.c
+12-5contrib/mtree/verify.c
+250-1534 files not shown
+271-16710 files

HardenedBSD/src c4d5a99sys/contrib/openzfs/contrib/initramfs/scripts zfs, sys/contrib/openzfs/module/os/linux/zfs zfs_ctldir.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+364-299sys/contrib/openzfs/contrib/initramfs/scripts/zfs
+103-66sys/contrib/openzfs/module/zfs/ddt.c
+104-38sys/contrib/openzfs/module/os/linux/zfs/zfs_ctldir.c
+71-42sys/contrib/openzfs/module/zfs/dsl_scan.c
+53-40sys/contrib/openzfs/module/zfs/arc.c
+86-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh
+781-48565 files not shown
+1,420-76971 files

HardenedBSD/src 1f7bbf9sys/contrib/openzfs/contrib/initramfs/scripts zfs, sys/contrib/openzfs/module/os/linux/zfs zfs_ctldir.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+364-299sys/contrib/openzfs/contrib/initramfs/scripts/zfs
+103-66sys/contrib/openzfs/module/zfs/ddt.c
+104-38sys/contrib/openzfs/module/os/linux/zfs/zfs_ctldir.c
+71-42sys/contrib/openzfs/module/zfs/dsl_scan.c
+53-40sys/contrib/openzfs/module/zfs/arc.c
+86-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh
+781-48565 files not shown
+1,420-76971 files

HardenedBSD/src 7f39d05sbin/reboot reboot.c

reboot: Fix halt -p behavior

The RB_HALT bit is always set when invoked as `halt`, so to maintain a
distinction between `halt` and `halt -p`, we must check the RB_POWEROFF
bit first.

PR:             291814
Fixes:          4453ec5b8716 ("reboot: Default to a clean shutdown")
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54320
DeltaFile
+2-2sbin/reboot/reboot.c
+2-21 files

HardenedBSD/src a8c594dsys/conf files.amd64

files.amd64: remove some lines duplicated from files.x86

These were added to files.x86 because they were duplicated in both
files.i386 and files.amd64, but they did not end up removed in the
latter.  Garbage collect them now.

Reviewed by:    jhibbits
Fixes:  b9c6fa339d9c7 ("files.x86: Pull in some more duplicate [...]")
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Differential Revision:  https://reviews.freebsd.org/D54295
DeltaFile
+0-2sys/conf/files.amd64
+0-21 files

HardenedBSD/src 34892a8sys/compat/linuxkpi/common/include/linux bitops.h, sys/modules Makefile

LinuxKPI: bitcount fix builds with gcc and older llvm

LLVM before 19 and gcc before 14 do not support __builtin_popcountg().
Use __const_bitcount<n> from sys/bitcount.h as a replacement in these
cases.  This should still allow drm-kmod to build where the size needs
to be known at compile-time.

Remove the conditional for gcc around the iwlwifi modules build,
which was collateral damage in all this.

Sponsored by:   The FreeBSD Foundation
Fixes:          7cbc4d875971, 5e0a4859f28a
MFC after:      3 days
Reviewed by:    brooks, emaste (without the sys/modules/Makefile change)
Differential Revision: https://reviews.freebsd.org/D54297
DeltaFile
+8-0sys/compat/linuxkpi/common/include/linux/bitops.h
+0-3sys/modules/Makefile
+8-32 files

HardenedBSD/src 27aa23csys/sys bitcount.h

sys/bitcount.h: add __const_bitcount<n>

Add a version of __const_bitcount<n> which can be used to get the
numbers at compile-time when __builtin_popcountg() is not available
(see sys/compat/linuxkpi/common/include/linux/bitops.h for LLVM before
19 and gcc before 14).

Obtained from:  https://reviews.freebsd.org/D50995#1174884 by obiwac
Sponsored by:   The FreeBSD Foundation
Reviewed by:    brooks, emaste
Differential Revision: https://reviews.freebsd.org/D54301
DeltaFile
+22-0sys/sys/bitcount.h
+22-01 files

HardenedBSD/src 546d3d0sys/contrib/openzfs/contrib/initramfs/scripts zfs, sys/contrib/openzfs/module/os/linux/zfs zfs_ctldir.c

zfs: merge openzfs/zfs at 962e68865

Notable upstream pull request merges:
 #16307 1d43387dd zdb: Add -O option for -r to specify object-id
 #17965 a62c62120 ARC: Pre-convert zfs_arc_min_prefetch_ms
 #17970 d393166c5 ARC: Increase parallel eviction batching
 #17981 20f09eae4 ZIO: ZIO_STAGE_DDT_WRITE is a blocking stage
 #17983 ff47dd35e Fix ddtprune causing space leak
 #18015 86b064469 FreeBSD: Fix a potential null dereference
                  in zfs_freebsd_fsync() (already merged)
 #18020 ff47dd35e Ensure 64-bit `off_t` is used in user space
                  instead of `loff_t`
 #18028 09492e0f2 Reduce dataset buffers re-dirtying
 #18033 f72fd378c Defer async destroys on pool import
 #18043 3d76ba273 Improve async destroy processing timing
 #18044 46d6f1fe5 DDT: Move logs searches out of the lock
 #18047 ff5414406 DDT: Switch to using ZAP _by_dnode() interfaces
 #18048 3b1ff816b DDT: Add/use zap_lookup_length_uint64_by_dnode()
 #18055 22e89aca8 DDT: Fix compressed entry buffer size

    [8 lines not shown]
DeltaFile
+364-299sys/contrib/openzfs/contrib/initramfs/scripts/zfs
+103-66sys/contrib/openzfs/module/zfs/ddt.c
+104-38sys/contrib/openzfs/module/os/linux/zfs/zfs_ctldir.c
+71-42sys/contrib/openzfs/module/zfs/dsl_scan.c
+53-40sys/contrib/openzfs/module/zfs/arc.c
+86-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh
+781-48555 files not shown
+1,344-72161 files

HardenedBSD/src f8cee1fcontrib/mtree mtree.c spec.c

Import latest mtree from NetBSD

Merge commit 'eb2ccba0c11b405ac613c3046997765317cc8b5c'

PR:             192839
PR:             219467
MFC after:      1 week
DeltaFile
+22-14contrib/mtree/mtree.c
+11-14contrib/mtree/spec.c
+6-10contrib/mtree/compare.c
+4-3contrib/mtree/create.c
+43-414 files

HardenedBSD/src eb2ccba. mtree.c spec.c

Vendor import of NetBSD's mtree at 2025-12-19
DeltaFile
+22-14mtree.c
+12-15spec.c
+7-11compare.c
+4-3create.c
+45-434 files

HardenedBSD/src fe53a8asys/net bpf_ifnet.c

bpf: add missing IFT_BRIDGE in the write method

Fixes:  8774a990ee4094f16d596d4b78e0f3239e5d0c88
DeltaFile
+1-0sys/net/bpf_ifnet.c
+1-01 files

HardenedBSD/src 5f1126fshare/man/man1 builtin.1, sys/dev/virtio/network if_vtnet.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+43-48sys/netpfil/pf/pf_ioctl.c
+62-0tests/sys/netinet6/ndp.sh
+31-9sys/kern/subr_prf.c
+16-22share/man/man1/builtin.1
+25-9sys/dev/virtio/network/if_vtnet.c
+21-10tests/sys/netinet6/ra.py
+198-9820 files not shown
+271-16326 files