HardenedBSD/src c446b8fsbin/devd snd.conf devd.conf.5, sys/dev/sound/pcm sound.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+7-74usr.sbin/mixer/mixer.c
+4-71usr.sbin/mixer/mixer.8
+10-0sbin/devd/snd.conf
+9-0sys/dev/sound/pcm/sound.c
+3-1sbin/devd/devd.conf.5
+33-1465 files

HardenedBSD/src 654bd3esbin/devd snd.conf devd.conf.5, sys/dev/sound/pcm sound.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+7-74usr.sbin/mixer/mixer.c
+4-71usr.sbin/mixer/mixer.8
+10-0sbin/devd/snd.conf
+9-0sys/dev/sound/pcm/sound.c
+3-1sbin/devd/devd.conf.5
+33-1465 files

HardenedBSD/src d00b32cusr.sbin/mixer mixer.c mixer.8

Revert "mixer(8): Implement hot-swapping"

We now have devd rules in snd.conf that achieve this in a much cleaner
way.

This reverts commit 9aac27599acaffa21ff69c5be8a2d71d29cc3d6b.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55532
DeltaFile
+7-74usr.sbin/mixer/mixer.c
+4-71usr.sbin/mixer/mixer.8
+11-1452 files

HardenedBSD/src 428517asbin/devd snd.conf devd.conf.5, sys/dev/sound/pcm sound.c

sound: Notify devd when no devices are connected

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D55531
DeltaFile
+10-0sbin/devd/snd.conf
+3-1sbin/devd/devd.conf.5
+2-0sys/dev/sound/pcm/sound.c
+15-13 files

HardenedBSD/src d40189fsys/dev/sound/pcm sound.c

sound: Notify devd on hw.snd.default_unit change

If we have virtual_oss running, this devd notification will make sure to
automatically transfer sound to the new default unit, while also making
sure that we switch to it only for the supported directions (recording
and/or playback).

For more information, please refer to 2ffaca551eaf ("snd_hda: Implement
automatic redirection between associations").

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D55530
DeltaFile
+7-0sys/dev/sound/pcm/sound.c
+7-01 files

HardenedBSD/src a0e1f06. Makefile.inc1, sys/conf kmod.mk kern.opts.mk

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+10-6sys/modules/Makefile
+6-2sys/conf/kmod.mk
+5-0sys/conf/kern.opts.mk
+2-1Makefile.inc1
+1-0sys/conf/files.arm64
+24-95 files

HardenedBSD/src b2a97b7. Makefile.inc1, sys/conf kmod.mk kern.opts.mk

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+10-6sys/modules/Makefile
+6-2sys/conf/kmod.mk
+5-0sys/conf/kern.opts.mk
+2-1Makefile.inc1
+1-0sys/conf/files.arm64
+24-95 files

HardenedBSD/src 9128649. Makefile.inc1

Run `make obj` before running `make test-includes`

Before this change, `make test-includes` (run as part of buildworld)
would place test files in the current directory, which would clutter up
git clones. Run `make obj` beforehand to ensure that the files are put
in `${.OBJDIR}` instead of `${.CURDIR}`. This helps cut down on the
noise significantly when running commands like `git status`.

MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D55499
DeltaFile
+2-1Makefile.inc1
+2-11 files

HardenedBSD/src c47cefbsys/conf kmod.mk kern.opts.mk, sys/modules Makefile

Only build USB-related modules if MK_USB != no

This change moves the thunderbolt module and other USB modules under a
MK_USB != no conditional to ensure that users not desiring USB support
can easily build systems without USB-specific drivers using this knob.

MFC after:      1 week
Reviewed By:    imp
Differential Revision: https://reviews.freebsd.org/D55576
DeltaFile
+10-6sys/modules/Makefile
+6-2sys/conf/kmod.mk
+5-0sys/conf/kern.opts.mk
+21-83 files

HardenedBSD/src 876d2b8sys/conf files.arm64

acpi: build dev/acpi_support/acpi_wmi_if.m on ARM64

Per Wikipedia, ACPI WMI support is available on all x86* platforms
and ARM platforms. Add the source to `files.arm64` so code that relies
on its headers (thunderbolt(4) for instance), can be built on ARM64.

MFC after:      1 month
Reviewed By:    andrew
Differential Revision: https://reviews.freebsd.org/D55535
DeltaFile
+1-0sys/conf/files.arm64
+1-01 files

HardenedBSD/src 2f13d1fsys/dev/le lance.c am79900.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+0-818sys/dev/le/lance.c
+0-651sys/dev/le/am79900.c
+0-616sys/dev/le/am7990.c
+0-611sys/dev/le/lancereg.h
+0-498sys/dev/le/if_le_pci.c
+0-494sys/dev/le/if_le_isa.c
+0-3,68827 files not shown
+225-4,80133 files

HardenedBSD/src 8a20b2fsys/dev/le lance.c am79900.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+0-818sys/dev/le/lance.c
+0-651sys/dev/le/am79900.c
+0-616sys/dev/le/am7990.c
+0-611sys/dev/le/lancereg.h
+0-498sys/dev/le/if_le_pci.c
+0-494sys/dev/le/if_le_isa.c
+0-3,68827 files not shown
+225-4,80133 files

HardenedBSD/src 6becc3dcontrib/tzdata NEWS europe

contrib/tzdata: import tzdata 2026a

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

MFC after:      3 days
DeltaFile
+98-1contrib/tzdata/NEWS
+68-6contrib/tzdata/europe
+16-32contrib/tzdata/Makefile
+12-10contrib/tzdata/theory.html
+4-4contrib/tzdata/leap-seconds.list
+4-4contrib/tzdata/leapseconds
+202-574 files not shown
+207-6510 files

HardenedBSD/src 18b0e60. NEWS europe

Import tzdata 2026a
DeltaFile
+98-1NEWS
+68-6europe
+16-32Makefile
+12-10theory.html
+4-4leap-seconds.list
+4-4leapseconds
+202-574 files not shown
+207-6510 files

HardenedBSD/src e4c8058usr.sbin/crunch/examples really-big.conf

crunch: ldconfig and ldd are unrelated to GNU ld

Move them to the usr.bin section.

Fixes: de5663609e4c ("This is the new crunch utility for making...")
DeltaFile
+4-4usr.sbin/crunch/examples/really-big.conf
+4-41 files

HardenedBSD/src 34d7f10usr.bin/less lesspipe.sh

lesspipe: Use zstdcat

zstdcat is equivalent to zstd -dcf, and matches our intention.

Suggested by:   delphij (in D55101)
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-1usr.bin/less/lesspipe.sh
+1-11 files

HardenedBSD/src 930486flib/libmt mtlib.c, usr.bin/mt mt.1

mt(1)/libmt: Add LTO-10 density codes and specs.

These were obtained from IBM specs and actual tapes/drives.

Standard LTO-10 cartriges hold 30TB raw, 75TB with 2.5:1 compression.
Premium LTO-10 cartridges hold 40TB raw, 100TB with 2.5:1 compression.
LTO-10 tape drives are not backward compatible with previous generation
LTO tapes. (This is a change from older generation drives.)

Since the Premium tape is a new thing for LTO, we'll call this density
code LTO-10P vs. the standard LTO-10.  The barcode identifier for LTO-10
tapes is "LA"; the barcode identifier for LTO-10P tapes is "PA".

LTO-10 cartridges contain 1035m of tape, while LTO-10 Premium
cartridges contain 1337m of tape and have slightly higher density.
(Obtained from MAM data on actual tape cartridges and the density
report, obtained via 'mt getdensity'.)  LTO-10 cartridges use a
polyethylene naphthalate (PEN) film substrate. LTO-10 Premium
cartridges use an Aramid (aromatic polyamide) substrate that is thinner

    [11 lines not shown]
DeltaFile
+8-1usr.bin/mt/mt.1
+2-0lib/libmt/mtlib.c
+10-12 files

HardenedBSD/src 7a323f8sys/dev/le lance.c am79900.c

sys: Retire le(4)

We retired most obsolete 10 and 10/100 Ethernet NIC drivers in 2019 --
see commits following ebcf740a32ae ("FCP-101: remove obsolete 10 and
10/100 Ethernet drivers.).

le(4) was retained with with the note "Emulated by QEMU, alternatives
don't yet work for mips64."  MIPS has since been removed from the tree
and emulators and virtual machines offer many other, more suitable
devices.

Reviewed by:    brooks
Relnotes:       Yes
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55516
DeltaFile
+0-818sys/dev/le/lance.c
+0-651sys/dev/le/am79900.c
+0-616sys/dev/le/am7990.c
+0-611sys/dev/le/lancereg.h
+0-498sys/dev/le/if_le_pci.c
+0-494sys/dev/le/if_le_isa.c
+0-3,68813 files not shown
+3-4,73019 files

HardenedBSD/src c6c85b1share/man/man4 virtio.4, sys/arm64/arm64 pmap.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+26-2share/man/man4/virtio.4
+6-1sys/dev/virtio/pci/virtio_pci.c
+6-1sys/dev/virtio/pci/virtio_pci_modern.c
+4-0sys/dev/virtio/virtio.c
+2-2sys/netinet6/in6_ifattach.c
+1-1sys/arm64/arm64/pmap.c
+45-71 files not shown
+46-77 files

HardenedBSD/src dec5bdeshare/man/man4 virtio.4, sys/arm64/arm64 pmap.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+26-2share/man/man4/virtio.4
+6-1sys/dev/virtio/pci/virtio_pci_modern.c
+6-1sys/dev/virtio/pci/virtio_pci.c
+4-0sys/dev/virtio/virtio.c
+2-2sys/netinet6/in6_ifattach.c
+1-1sys/arm64/arm64/pmap.c
+45-71 files not shown
+46-77 files

HardenedBSD/src 12139c9sys/contrib/openzfs/contrib/initramfs/scripts zfs, sys/contrib/openzfs/module/os/linux/spl spl-math-compat.c spl-generic.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+600-189sys/contrib/openzfs/module/zfs/spa.c
+364-299sys/contrib/openzfs/contrib/initramfs/scripts/zfs
+191-177sys/sys/elf_common.h
+275-0sys/contrib/openzfs/module/os/linux/spl/spl-math-compat.c
+0-258sys/contrib/openzfs/module/os/linux/spl/spl-generic.c
+166-76sys/contrib/openzfs/module/zfs/ddt.c
+1,596-999128 files not shown
+4,101-1,688134 files

HardenedBSD/src c70755bshare/man/man4 virtio.4, sys/dev/virtio virtio.c

virtio: add loader tunables to sysctl

virtio_pci uses two loader tunables that should be more visible.
This patch adds these loader tunables to sysctl and describes them
in the virtio(4) man page.

Reviewed by:            imp (erlier version), tuexen
MFC after:              1 week
Differential Revision:  https://reviews.freebsd.org/D55533
DeltaFile
+26-2share/man/man4/virtio.4
+6-1sys/dev/virtio/pci/virtio_pci.c
+6-1sys/dev/virtio/pci/virtio_pci_modern.c
+4-0sys/dev/virtio/virtio.c
+42-44 files

HardenedBSD/src 0272359sys/arm64/arm64 pmap.c, sys/arm64/include vm.h

arm64/pmap: fix pmap_is_valid_memattr()

The function pmap_is_valid_memattr(pmap, mode) checks whether the
given variable mode is between the two constant values
VM_MEMATTR_DEVICE and VM_MEMATTR_WRITE_THROUGH.
After the code for this function was written, the value of
VM_MEMATTR_DEVICE changed from 0 to 4. Since VM_MEMATTR_WRITE_THROUGH
is still 3, the condition is always false.
This patch changes the condition to check whether mode is equal to any
of the VM_MEMATTR* constants.

Reviewed by:            andrew, tuexen
MFC after:              1 week
Differential Revision:  https://reviews.freebsd.org/D55534
DeltaFile
+1-1sys/arm64/arm64/pmap.c
+1-0sys/arm64/include/vm.h
+2-12 files

HardenedBSD/src b55bffesys/netinet6 in6_ifattach.c

netinet6: Fix memory leak on auto_linklocal

release the refcount of link-local prefix information to ensure
it gets freed when the address is deleted.

Reviewed By: zlei, ivy
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D55593
DeltaFile
+2-2sys/netinet6/in6_ifattach.c
+2-21 files

HardenedBSD/src acf90e2sys/sys elf_common.h

elf_common.h: Sort SHT_ entries

Reviewed by:    jrtc27
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55488

(cherry picked from commit 0ff08b8c402b3c555125e4c72df0b80b4d084d56)
DeltaFile
+3-2sys/sys/elf_common.h
+3-21 files

HardenedBSD/src 2b6ba65sys/sys elf_common.h

sys: Restore sorting in sys/elf_common.h

These various definitions are meant to be kept sorted by machine prefix.

Fixes:  2bb61497ca76 ("elf_common.h: Add definitions for LoongArch ELF files")
(cherry picked from commit b7ef4f4b230f01968473269f280bd7e4e86a3ec9)
DeltaFile
+175-175sys/sys/elf_common.h
+175-1751 files

HardenedBSD/src 50a7a38sys/sys elf_common.h

elf_common.h: Add some AArch32 relocations

Reviewed by:    mmel
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55268

(cherry picked from commit 10ac7413c060b1496ef54e2338f487ea84f66206)
DeltaFile
+13-0sys/sys/elf_common.h
+13-01 files

HardenedBSD/src a8dbd83sys/contrib/openzfs/cmd zhack.c, sys/contrib/openzfs/contrib/initramfs/scripts zfs

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

OpenZFS 2.4.1

Notable upstream pull request merges:
 #16307 ccb7c82aa zdb: Add -O option for -r to specify object-id
 #17839 c4ad5e293 zpool: fix conflict with -v and -o options
 #17970 8a79d0968 ARC: Increase parallel eviction batching
 #17965 5e0f20088 ARC: Pre-convert zfs_arc_min_prefetch_ms
 #17981 e865ddad5 ZIO: ZIO_STAGE_DDT_WRITE is a blocking stage
 #18028 6482a27e8 Reduce dataset buffers re-dirtying
 #18033 135103a64 Defer async destroys on pool import
 #18043 242804370 Improve async destroy processing timing
 #18044 fa857113a DDT: Move logs searches out of the lock
 #18047 4905686e6 DDT: Switch to using ZAP _by_dnode() interfaces
 #18048 4ab2027f5 DDT: Add/use zap_lookup_length_uint64_by_dnode()
 #18055 96b1d2fae DDT: Fix compressed entry buffer size
 #18059 8dd01181a RAIDZ: Remove some excessive logging
 #18060 35ee242ab Reduce minimal scrub/resilver times

    [36 lines not shown]
DeltaFile
+600-189sys/contrib/openzfs/module/zfs/spa.c
+364-299sys/contrib/openzfs/contrib/initramfs/scripts/zfs
+275-0sys/contrib/openzfs/module/os/linux/spl/spl-math-compat.c
+0-258sys/contrib/openzfs/module/os/linux/spl/spl-generic.c
+166-76sys/contrib/openzfs/module/zfs/ddt.c
+153-6sys/contrib/openzfs/cmd/zhack.c
+1,558-828126 files not shown
+3,908-1,510132 files

HardenedBSD/src 960ef72libexec/rc/rc.d virtual_oss

virtual_oss: use hw.snd.default_unit by default

Reviewed by:    christos
MFC after:      1 week
Signed-off-by:  Quentin Thébault <quentin.thebault at defenso.fr>
Sponsored by:   Defenso
PR:             293130
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2043
(cherry picked from commit 06b466526a7fc35cc6fc5bf6f6269e7f3a0a7aea)
DeltaFile
+2-1libexec/rc/rc.d/virtual_oss
+2-11 files

HardenedBSD/src bb57f6dshare/man/man5 style.mdoc.5, usr.bin/diff3 diff3.c diff3.1

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2-77share/man/man5/style.mdoc.5
+13-13usr.bin/diff3/diff3.c
+16-1usr.bin/diff3/diff3.1
+31-913 files