FreeBSD/src 1f72d52sys/cam/nvme nvme_da.c

Revert "nda: Filter non-storage nvme drives"

This reverts commit b40205855e100a4bd95f89e97c15d268ef5b3a35. There's an
aparent path lifetime issue in it that needs to be investigated.

Sponsored by:           Netflix
DeltaFile
+0-14sys/cam/nvme/nvme_da.c
+0-141 files

FreeBSD/src 85a04besys/conf std.nodebug

conf/std.nodebug: disable DEBUG_LOCKS

MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-0sys/conf/std.nodebug
+1-01 files

FreeBSD/src 18787e4contrib/tzdata northamerica NEWS

contrib/tzdata: import tzdata 2026b

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

(cherry picked from commit 9b95cab0a2927dfe07dbe6dc0056a80d5c730414)
DeltaFile
+55-1contrib/tzdata/northamerica
+45-8contrib/tzdata/NEWS
+3-0contrib/tzdata/zonenow.tab
+1-1contrib/tzdata/zone.tab
+1-1contrib/tzdata/zone1970.tab
+1-1contrib/tzdata/version
+106-126 files

FreeBSD/src 30eb334contrib/tzdata northamerica NEWS

contrib/tzdata: import tzdata 2026b

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

(cherry picked from commit 9b95cab0a2927dfe07dbe6dc0056a80d5c730414)
DeltaFile
+55-1contrib/tzdata/northamerica
+45-8contrib/tzdata/NEWS
+3-0contrib/tzdata/zonenow.tab
+1-1contrib/tzdata/zone.tab
+1-1contrib/tzdata/version
+1-1contrib/tzdata/zone1970.tab
+106-126 files

FreeBSD/src a02d794sys/fs/nullfs null_vnops.c, sys/kern vfs_inotify.c

nullfs: Clear inotify flags during reclaim

The inotify flags are copied from the lower vnode into the nullfs vnode
so that the INOTIFY() macro will invoke VOP_INOTIFY on the nullfs vnode;
this is then bypassed to the lower vnode.  However, when a nullfs vnode
is reclaimed we should clear these flags, as the vnode is now doomed and
no longer forwards VOPs to the lower vnode.

Add regression tests.  Remove a test in vn_inotify_revoke() which is no
longer needed after this change.

PR:             292495
Reviewed by:    kib
Reported by:    Jed Laundry <jlaundry at jlaundry.com>
Fixes:          f1f230439fa4 ("vfs: Initial revision of inotify")
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56639
DeltaFile
+112-0tests/sys/kern/inotify_test.c
+12-0sys/fs/nullfs/null_vnops.c
+0-4sys/kern/vfs_inotify.c
+124-43 files

FreeBSD/src e3b8e55contrib/netbsd-tests/lib/libc/sys t_mmap.c

netbsd-tests: Fix the mmap_truncate_signal test

Add a volatile qualifier in the loop which triggers SIGBUS, as otherwise
the compiler is smart enough to elide it, replacing it with a check for
page != 0.

MFC after:      1 week
DeltaFile
+1-1contrib/netbsd-tests/lib/libc/sys/t_mmap.c
+1-11 files

FreeBSD/src bea1741tests/sys/netpfil/ipfw lookup.sh fwd.sh

tests/ipfw: Make tests run more reliably in parallel

- Don't use /dev/null as the pidfile for inetd, that doesn't work
  properly.  Create a pidfile in the per-test scratch directory.
- Use atf_check to validate results from setup commands.

MFC after:      1 week
DeltaFile
+8-9tests/sys/netpfil/ipfw/lookup.sh
+7-7tests/sys/netpfil/ipfw/fwd.sh
+15-162 files

FreeBSD/src 1e5aff8contrib/tzdata northamerica NEWS

contrib/tzdata: import tzdata 2026b

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

(cherry picked from commit 9b95cab0a2927dfe07dbe6dc0056a80d5c730414)
DeltaFile
+55-1contrib/tzdata/northamerica
+45-8contrib/tzdata/NEWS
+3-0contrib/tzdata/zonenow.tab
+1-1contrib/tzdata/version
+1-1contrib/tzdata/zone.tab
+1-1contrib/tzdata/zone1970.tab
+106-126 files

FreeBSD/src 1316cf5usr.bin/du du.1

Fix reversion introduced in commit 32b0dfb326593b8dae31cc2bdc1e2d08ea70e9d7

Noted by: mckusick
DeltaFile
+2-2usr.bin/du/du.1
+2-21 files

FreeBSD/src cd1c4fbsys/dev/sound/pcm sound.h, sys/dev/sound/usb uaudio.h

sound: Remove some forward declarations from sound.h and uaudio.h

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 602249f033d146d9c731d8b1cb4b2e0899c61ad9)
DeltaFile
+1-4sys/dev/sound/pcm/sound.h
+0-2sys/dev/sound/usb/uaudio.h
+1-62 files

FreeBSD/src f9d4517lib/libmixer mixer.c

mixer(3): Rename _mixer_readvol() to mixer_readvol()

No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit c39237a4fd2b1472e452052103156c915942d070)
DeltaFile
+3-5lib/libmixer/mixer.c
+3-51 files

FreeBSD/src d185427sys/dev/vt vt_core.c

vt_core: make sure the driver's functions exist

These are NULL if they're not implemented. Make sure all the functions
we need are there before doing anything.

Also invert the first if statment to lessen the indentation a bit.

Reported by:    Quentin Thébault <quentin.thebault at defenso.fr>
MFC after:      3 days
DeltaFile
+34-25sys/dev/vt/vt_core.c
+34-251 files

FreeBSD/src e72c593sys/dev/vt vt_core.c

vt_core: delay the shutdown splash event handler

Even though the functions are currently executed in the correct order,
there's no garuntee that this will always be the case.

Reported by:    kevans
Discussed with: kevans
Fixes:          4b862c713ac5556ab4bd1828b47c5eb9cb28e067
MFC after:      3 days
DeltaFile
+1-1sys/dev/vt/vt_core.c
+1-11 files

FreeBSD/src ba7f47dsys/net if.c

ifnet: if_detach(): Fix races with vmove operations

The rationality is that the driver private data holds a strong reference
to the interface, and the detach operation shall never fail. Given the
vmove operation, if_vmove_loan(), if_vmove_reclaim() or vnet_if_return()
is not atomic and spans multiple steps, acquire ifnet_detach_sxlock only
for if_detach_internal() and if_vmove() is not sufficient. It is possible
that the thread running if_detach() sees stale vnet, or the vmoving is
in progress, then if_unlink_ifnet() will fail.

Fix that by extending coverage of ifnet_detach_sxlock a bit to also
cover if_unlink_ifnet(), so that the entire detach and vmove operation
is serialized.

Given it is an error when the if_unlink_ifnet() fails, and if_detach()
is a public KPI, prefer panic() over assertion on failure, to indicate
explicitly that bad thing happens. That shall also prevent potential
corrupted status of the interface, which is a bit hard to diagnose.


    [4 lines not shown]
DeltaFile
+17-6sys/net/if.c
+17-61 files

FreeBSD/src c017816tools/tools/ifinfo ifinfo.c

ifinfo: improve output of hwassist value

In addition to print the hexadecimal number hwassist, also print
the symbolic names of the corresponding CSUM_* flags.

Reviewed by:            tuexen
Differential Revision:  https://reviews.freebsd.org/D55055
Event:                  Wiesbaden Hackathon 2026
(cherry picked from commit d84870d90bafe75eb87759df0ab41ff0214c866e)
DeltaFile
+47-1tools/tools/ifinfo/ifinfo.c
+47-11 files

FreeBSD/src e0b74e7release/packages/ucl pkgconf-all.ucl

Revert "packages: Register pkgconf"

This reverts commit 970cef9f652ec4d902b20cba6d99dce48458d7b6.

I made a mistake when rebasing 1342eb5a832fa10e689a29faab3acb6054e4778c;
I did not mean to re-introduce this one.
DeltaFile
+0-32release/packages/ucl/pkgconf-all.ucl
+0-321 files

FreeBSD/src 1342eb5lib/libpkgconf Makefile, usr.bin/bomtool Makefile

pkgconf: fix the build with GCC 14

Building pkgconf with GCC 14 currently fails with:
no option '-Wincompatible-pointer-types-discards-qualifiers'

This relaxes warnings for libpkgconf, pkgconf(1), and bomtool(1) until
the improvements are published upstream (see PR #444).

Co-authored-by: ngie
Approved by:    ngie
Sponsored by:   The FreeBSD Foundation
Event:          Wiesbaden Hackathon 202604
Differential Revision:  https://reviews.freebsd.org/D56591
DeltaFile
+2-3lib/libpkgconf/Makefile
+2-3usr.bin/bomtool/Makefile
+2-3usr.bin/pkgconf/Makefile
+6-93 files

FreeBSD/src 970cef9release/packages/ucl pkgconf-all.ucl

packages: Register pkgconf

This should fix the creation of the new packages introduced by the
import of pkgconf into the base system.

Fixes:                  b8352da33f34 ("pkgconf: import into the base system")
Sponsored by:           The FreeBSD Foundation
Differential revision:  https://reviews.freebsd.org/D56589
DeltaFile
+32-0release/packages/ucl/pkgconf-all.ucl
+32-01 files

FreeBSD/src 56d81ebusr.bin/ident ident.1

ident: Fix typo in manual page

Fixes:          394f6b1b0a65 ("ident: Clean up")
(cherry picked from commit 3e6a26df1fb7e0508e1f81f826f8945b15a8bb48)
DeltaFile
+2-2usr.bin/ident/ident.1
+2-21 files

FreeBSD/src 3e6a26dusr.bin/ident ident.1

ident: Fix typo in manual page

Fixes:          394f6b1b0a65 ("ident: Clean up")
DeltaFile
+2-2usr.bin/ident/ident.1
+2-21 files

FreeBSD/src 5845acbusr.bin/sockstat sockstat.1

sockstat: Unbreak SEE ALSO section

MFC after:      1 week
Fixes:          7b35b4d19630 ("sockstat: add libxo support")

(cherry picked from commit a6bd704850a615ae81076855a2083c7ab6481df1)
DeltaFile
+3-3usr.bin/sockstat/sockstat.1
+3-31 files

FreeBSD/src c285081usr.bin/printenv printenv.c, usr.bin/printenv/tests printenv_test.sh

printenv: Clean up

* Error out if more than one argument is given.

* Check for stdio errors.

* Clean up the code.

* Clean up and expand the tests.

MFC after:      1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D56506

(cherry picked from commit abdf2a711cabebc107a04fd286e441e2030827f0)
DeltaFile
+52-18usr.bin/printenv/tests/printenv_test.sh
+30-22usr.bin/printenv/printenv.c
+82-402 files

FreeBSD/src 9671282usr.bin/ident ident.c ident.1, usr.bin/ident/tests ident_test.sh

ident: Clean up

* Use libcasper instead of reinventing it.

* Add long option support.

* Drop pointless use of temporary locales.

* Consistently check for stdio errors.

* Clean up the code.

* Clean up and expand the tests.

MFC after:      1 week
Reviewed by:    ngie
Differential Revision:  https://reviews.freebsd.org/D56505

(cherry picked from commit 394f6b1b0a658755a9420906fb7a459c3d9501a5)
DeltaFile
+75-71usr.bin/ident/ident.c
+84-10usr.bin/ident/tests/ident_test.sh
+7-4usr.bin/ident/ident.1
+6-0usr.bin/ident/Makefile
+172-854 files

FreeBSD/src 3e08becshare/man/man7 tests.7

tests.7: Provide better examples

Previous authors appear to have prioritized brevity over clarity.  This
unfortunately resulted in a manual page that left its reader with the
false impression that Kyua is difficult to use.  Attempt to correct
this by providing more and simpler examples with longer explanations.

While here, correct outdated information about where Kyua stores its
logs and results.

MFC after:      1 week
Reviewed by:    ziaee, ngie
Differential Revision:  https://reviews.freebsd.org/D56475

(cherry picked from commit 3d00db6b8b73ef7f89654a2928d247d62d39ee29)
DeltaFile
+89-13share/man/man7/tests.7
+89-131 files

FreeBSD/src 47799d1. README.md

README: Update and harmonize

MFC after:      1 week
Reviewed by:    imp, markj, jhb
Differential Revision:  https://reviews.freebsd.org/D56499

(cherry picked from commit 480ba21efdc7df5d972083e64c88c39357877c0b)
DeltaFile
+12-11README.md
+12-111 files

FreeBSD/src 7f207b6stand/powerpc/boot1.chrp Makefile

Revert "Tentative fix for powerpc boot1.chrp linking problem."

This reverts base 4822a2cf990048c6eed7822fd34a1aeeb7c39cdf. The change
in base aa0bc7cca153f67f8becec8a8fb259ff5fd30fd0 already fixed the
original issue, which is that newer versions of lld complain "section
'.text' address (0x38000) is smaller than image base (0x10000000);
specify --image-base".

Reported by:    ivy
PR:             292067
MFC after:      1 month
DeltaFile
+0-6stand/powerpc/boot1.chrp/Makefile
+0-61 files

FreeBSD/src e6b2a40share/man/man7 build.7

build.7: Explain specifying multiple KERNCONFs

MFC after:              3 days
Reviewed by:            ivy, mhorne
Differential Revision:  https://reviews.freebsd.org/D56281

(cherry picked from commit b183dae4a9934ed9bb91763b5f9d9d4e4d4120a2)
DeltaFile
+14-5share/man/man7/build.7
+14-51 files

FreeBSD/src 73a0242share/man/man7 build.7

build.7: Improve make delete-old example

Be more explicit that deleting old files and libraries needs to be
really after you're rebooted a third time and you're really actually
sure your applications aren't using old libs, following irc discussion.

Also adjust an example slightly to fit on 80 character console.

MFC after:              3 days
Discussed with:         emaste, fuz, jhb
Differential Revision:  https://reviews.freebsd.org/D54079

(cherry picked from commit 1d69c8e4ac7da648f63a830b23b872582469ba37)
DeltaFile
+11-7share/man/man7/build.7
+11-71 files

FreeBSD/src 7bb347cshare/man/man7 build.7

build.7: Explain packaging a custom kernel

MFC after:              3 days (to 15 only)
Requested by:           vermaden
Discussed with:         emaste, ivy, Mark Millard <markmi_dsl-only.net>
Differential Revision:  https://reviews.freebsd.org/D56217

(cherry picked from commit 1bcd2e2f8311b737170e4bae8381dcb7de2c4413)
DeltaFile
+15-4share/man/man7/build.7
+15-41 files

FreeBSD/src a4a4dbeshare/man/man7 freebsd-base.7

freebsd-base.7: Add a caveat about dev branches

MFC after:              3 days (to 15)
Discussed with:         bapt, emaste, ivy
Differential Revision:  https://reviews.freebsd.org/D56389

(cherry picked from commit 886610c1003e0d0e270531f5a75b0f2c2b5eb2b8)
DeltaFile
+4-1share/man/man7/freebsd-base.7
+4-11 files