HardenedBSD/src 4fad675contrib/kyua/cli cmd_debug.cpp, contrib/kyua/utils/cmdline options.cpp parser.cpp

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+81-1contrib/kyua/cli/cmd_debug.cpp
+24-0contrib/kyua/utils/process/child.cpp
+12-12contrib/mtree/mtree.8
+17-3contrib/kyua/utils/cmdline/options.cpp
+20-0contrib/kyua/utils/process/child.ipp
+15-5contrib/kyua/utils/cmdline/parser.cpp
+169-218 files not shown
+205-4614 files

HardenedBSD/src 883159acontrib/kyua/cli cmd_debug.cpp, contrib/kyua/utils/cmdline options.cpp parser.cpp

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+81-1contrib/kyua/cli/cmd_debug.cpp
+12-12contrib/mtree/mtree.8
+24-0contrib/kyua/utils/process/child.cpp
+20-0contrib/kyua/utils/process/child.ipp
+17-3contrib/kyua/utils/cmdline/options.cpp
+15-5contrib/kyua/utils/cmdline/parser.cpp
+169-218 files not shown
+205-4614 files

HardenedBSD/src da5d94dusr.bin/grep zgrep.1, usr.bin/grep/tests grep_freebsd_test.sh

Remove obsolete BUGS section from zgrep(1) man page, add test

I forgot to check/update the man page with D54217. While here add
a test for multiple -e flags.

Reviewed by:    markj
Approved by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54632
DeltaFile
+0-18usr.bin/grep/zgrep.1
+11-0usr.bin/grep/tests/grep_freebsd_test.sh
+11-182 files

HardenedBSD/src 4250d2acontrib/mtree mtree.8 create.c

Import latest mtree from NetBSD

Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d'

This commit partially reverts the previous vendor import, given that the
"type" keyword has been historically mandatory and should not be removed
by "-R all".  This was clarified in the man page.

Reported by:    glebius
PR:             219467
MFC after:      1 week
DeltaFile
+12-12contrib/mtree/mtree.8
+3-4contrib/mtree/create.c
+15-162 files

HardenedBSD/src 7e59b23. mtree.8 create.c

Vendor import of NetBSD's mtree at 2026-01-11
DeltaFile
+12-12mtree.8
+3-4create.c
+15-162 files

HardenedBSD/src 717ae16sbin/newfs newfs.c

newfs: Add -u to getopt string

Fixes:          68562f8145e8 ("newfs: Add an option to disable soft updates")
DeltaFile
+1-1sbin/newfs/newfs.c
+1-11 files

HardenedBSD/src 8a21c17contrib/kyua/cli cmd_debug.cpp, contrib/kyua/utils/cmdline options.cpp parser.cpp

kyua: Add "debug -x|--execute cmd" option

With execenv=jail specified, the "cmd" runs inside the test's jail.

Reviewed by:    ngie, markj
Differential Revision:  https://reviews.freebsd.org/D52642
DeltaFile
+81-1contrib/kyua/cli/cmd_debug.cpp
+24-0contrib/kyua/utils/process/child.cpp
+20-0contrib/kyua/utils/process/child.ipp
+17-3contrib/kyua/utils/cmdline/options.cpp
+15-5contrib/kyua/utils/cmdline/parser.cpp
+6-2contrib/kyua/utils/cmdline/options.hpp
+163-113 files not shown
+178-119 files

HardenedBSD/src 0adf57crelease/powerpc mkisoimages.sh

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-1release/powerpc/mkisoimages.sh
+1-11 files

HardenedBSD/src 77afb35release/powerpc mkisoimages.sh

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-1release/powerpc/mkisoimages.sh
+1-11 files

HardenedBSD/src 7afa039release/powerpc mkisoimages.sh

powerpc: fix release image building for Apple partitions

awk changed somewhere between 14 and 15 and it stopped accepting
a hexadecimal number as its input - it will always return 0.
This results in a very badly written apple boot block.

So just remove it; do the math in shell.

PR:             kern/292341
Differential Revision:  https://reviews.freebsd.org/D54639
Reviewed by:    imp
MFC after:      1 week
DeltaFile
+1-1release/powerpc/mkisoimages.sh
+1-11 files

HardenedBSD/src f45c26esbin/newfs newfs.8 newfs.c, share/mk bsd.man.mk

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+18-6sbin/newfs/newfs.8
+6-3sbin/newfs/newfs.c
+3-3share/mk/bsd.man.mk
+27-123 files

HardenedBSD/src 9f33a83sbin/newfs newfs.8 newfs.c, share/mk bsd.man.mk

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+18-6sbin/newfs/newfs.8
+6-3sbin/newfs/newfs.c
+3-3share/mk/bsd.man.mk
+27-123 files

HardenedBSD/src 9fed072share/mk bsd.man.mk

bsd.man.mk simplify staging

We actually only need the high level targets stage_files and stage_links
meta.stage.mk will take care of the details.
DeltaFile
+2-2share/mk/bsd.man.mk
+2-21 files

HardenedBSD/src 9cd89fcshare/mk bsd.man.mk

bsd.man.mk fix staging

The STAGE_SETS and STAGE_TARGETS need to match
STAGE_DIR.

For each STAGE_SET we have STAGE_DIR.${STAGE_SET}
and create a target stage_files.${STAGE_SET},
the settings all need to be self consistent to work.
DeltaFile
+2-2share/mk/bsd.man.mk
+2-21 files

HardenedBSD/src 68562f8sbin/newfs newfs.8 newfs.c

newfs: Add an option to disable soft updates

A previous commit turned soft updates on by default for UFS2 without
providing a way to turn them off.  This corrects that by adding a new -u
flag which forces soft updates (and soft updates journaling) off.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Fixes:          61dece6d27fb ("Enable soft updates by default for UFS2 filesystems.")
Reviewed by:    mckusick
Differential Revision:  https://reviews.freebsd.org/D54576
DeltaFile
+18-6sbin/newfs/newfs.8
+6-3sbin/newfs/newfs.c
+24-92 files

HardenedBSD/src 3284429sys/dev/cxgbe t4_sge.c, sys/dev/cxgbe/common t4_regs.h t4_hw.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+825-235sys/dev/cxgbe/common/t4_regs.h
+528-194usr.sbin/cxgbetool/reg_defs_t7.c
+67-64sys/dev/cxgbe/t4_sge.c
+22-12sys/dev/cxgbe/firmware/t7fw_cfg.txt
+18-8sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt
+6-7sys/dev/cxgbe/common/t4_hw.c
+1,466-5201 files not shown
+1,467-5217 files

HardenedBSD/src 7f32a70sys/dev/cxgbe t4_sge.c, sys/dev/cxgbe/common t4_regs.h t4_hw.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+825-235sys/dev/cxgbe/common/t4_regs.h
+528-194usr.sbin/cxgbetool/reg_defs_t7.c
+67-64sys/dev/cxgbe/t4_sge.c
+22-12sys/dev/cxgbe/firmware/t7fw_cfg.txt
+18-8sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt
+6-7sys/dev/cxgbe/common/t4_hw.c
+1,466-5201 files not shown
+1,467-5217 files

HardenedBSD/src 6a87f31contrib/bmake configure var.c, contrib/bmake/mk options.mk ChangeLog

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+102-46contrib/bmake/mk/options.mk
+44-9contrib/bmake/configure
+49-0contrib/bmake/mk/ChangeLog
+43-3contrib/bmake/var.c
+37-0contrib/bmake/ChangeLog
+20-16contrib/bmake/mk/install-new.mk
+295-7487 files not shown
+690-69893 files

HardenedBSD/src dda55f8sys/dev/cxgbe/common t4_regs.h t4_hw.c, sys/dev/cxgbe/firmware t7fw_cfg.txt t7fw_cfg_uwire.txt

cxgbe(4): Update shared code and config files

Obtained from:  Chelsio Communications
MFC after:      1 week
Sponsored by:   Chelsio Communications
DeltaFile
+825-235sys/dev/cxgbe/common/t4_regs.h
+528-194usr.sbin/cxgbetool/reg_defs_t7.c
+22-12sys/dev/cxgbe/firmware/t7fw_cfg.txt
+18-8sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt
+6-7sys/dev/cxgbe/common/t4_hw.c
+1,399-4565 files

HardenedBSD/src 01c0005sys/dev/cxgbe t4_sge.c

cxgbe(4): Move CPL-specific handling out of eth_rx

IPsec rx uses a new CPL and this prepares eth_rx for IPsec support in
future commits.

Tidy up the comment and code around M_TSTMP while here.

MFC after:      1 week
Sponsored by:   Chelsio Communications
DeltaFile
+67-64sys/dev/cxgbe/t4_sge.c
+67-641 files

HardenedBSD/src 11aa327contrib/bmake configure var.c, contrib/bmake/mk options.mk ChangeLog

Update to bmake-20251111

Merge commit '638c66de4a0faa4c2e815e81cd4021c2387c7e0f'

(cherry picked from commit c60f6422ffae3ea85e7b10bad950ad27c463af18)
DeltaFile
+102-46contrib/bmake/mk/options.mk
+44-9contrib/bmake/configure
+49-0contrib/bmake/mk/ChangeLog
+43-3contrib/bmake/var.c
+37-0contrib/bmake/ChangeLog
+20-16contrib/bmake/mk/install-new.mk
+295-7487 files not shown
+690-69893 files

HardenedBSD/src 73a2386sys/dev/smartpqi smartpqi_request.c

smartpqi: Make pqisrc_is_supported_write static

This fixes a build error with -O0 and matches all the other pqisrc_is_*
routines in the file.

--- kernel.full ---
ld: error: undefined symbol: pqisrc_is_supported_write
>>> referenced by smartpqi_request.c:1799 (/.../smartpqi_request.c:1799)
>>>               smartpqi_request.o:(pqisrc_build_scsi_cmd_raidbypass)
DeltaFile
+1-1sys/dev/smartpqi/smartpqi_request.c
+1-11 files

HardenedBSD/src 41302c6sys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h, sys/contrib/device-tree/include/dt-bindings/reset cv181x-resets.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-932sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+0-378sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+0-320sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+0-175sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+0-172sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+0-120sys/contrib/device-tree/src/riscv/sophgo/cv181x_asic_qfn.dtsi
+0-2,09718 files not shown
+9-2,73524 files

HardenedBSD/src 069a8ffsys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h, sys/contrib/device-tree/include/dt-bindings/reset cv181x-resets.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-932sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+0-378sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+0-320sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+0-175sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+0-172sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+0-120sys/contrib/device-tree/src/riscv/sophgo/cv181x_asic_qfn.dtsi
+0-2,09718 files not shown
+9-2,73524 files

HardenedBSD/src e616025release/tools gce.conf, sys/cam/mmc mmc_xpt.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+1-2release/tools/gce.conf
+1-1sys/dev/mps/mps.c
+1-1sys/cam/mmc/mmc_xpt.c
+1-1sys/dev/oce/oce_mbox.c
+1-1sys/net/altq/altq.h
+1-1sys/netgraph/bluetooth/include/ng_hci.h
+6-76 files

HardenedBSD/src 509a185sys/net80211 ieee80211_radiotap.c

net80211: fix bpf tap leak on wlan(4) detach

PR:     292337
Fixes:  8774a990ee4094f16d596d4b78e0f3239e5d0c88
DeltaFile
+9-6sys/net80211/ieee80211_radiotap.c
+9-61 files

HardenedBSD/src 24a20efrelease/tools gce.conf

GCE: Fix growfs path

The sed command was missing the ${DESTDIR} prefix, meaning it was
attempting to modify the build host's /etc/rc.d/growfs instead of
the target image's script. Tested in an arm64 builder that builds
as non-root.

PR:             kern/292081

(cherry picked from commit 709c1049fe0c6d0217e81268d4f33f7191474453)
DeltaFile
+1-1release/tools/gce.conf
+1-11 files

HardenedBSD/src 6c20edfrelease/tools gce.conf

GCE: Enable vtnet(4) Multiqueue.

Removes hw.vtnet.mq_disable=1.

This workaround was originally introduced nearly a decade ago to
address stability issues on KVM that have long since been resolved
in both the FreeBSD driver and the GCE hypervisor. Removing this
allows network interrupts to scale across multiple vCPUs.

Tested on n2-highcpu-16 VM with 15.0-RELEASE and confirmed multiple
queue pairs active and interrupts handling across cores.

PR:             kern/292081

(cherry picked from commit f604d84618ad478fa46ec374480cbcbc1d93bf07)
DeltaFile
+0-1release/tools/gce.conf
+0-11 files

HardenedBSD/src 3ae56f6sys/contrib/device-tree/include/dt-bindings/clock cv181x-clock.h, sys/contrib/device-tree/include/dt-bindings/reset cv181x-resets.h

Revert "ophgo: import new .dts"

This reverts commit b55d106df9785d141f9e3e1c916e921df9d877ac.

Per request of original author, manu, and mmel, revert this
change. While this is a genuinely cool device, there's some issues that
need to be sorted out before moving forward:

o Imported dt-bindings that weren't used and could interfere in the
  future.
o no platform code for sophgo, though it likely needs it
o Potential interference from the dts/dtsi files imported for future
  linux device-tree imports. These are the dts files from the vendor
  sdk, and history has down often upstream introduces enough change
  that keeping them here in the mean time lays the groundwork for
  merge conflicts in the future.

That makes this import premature.  Revert until it's more mature.
DeltaFile
+0-932sys/contrib/device-tree/src/riscv/sophgo/cv181x_base.dtsi
+0-378sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_riscv.dtsi
+0-320sys/contrib/device-tree/src/riscv/sophgo/cv181x_base_arm.dtsi
+0-175sys/contrib/device-tree/include/dt-bindings/clock/cv181x-clock.h
+0-172sys/contrib/device-tree/include/dt-bindings/reset/cv181x-resets.h
+0-120sys/contrib/device-tree/src/riscv/sophgo/cv181x_asic_qfn.dtsi
+0-2,09717 files not shown
+0-2,72923 files

HardenedBSD/src 6946e9asys/dev/mps mps.c

mps(4): Fix a typo in a device message

- s/reseting/resetting/

(cherry picked from commit bcc735cb710fb74d1fb5f7be3d37701343c58ccd)
DeltaFile
+1-1sys/dev/mps/mps.c
+1-11 files