Warning: there may be occasional oddness due to css and blog edits. **KNOWN ISSUE: possible hidden text**

Friday, October 31, 2025

OS upgrade while xlibre

Have I updated the kernel and world without breaking xlibre yet?  It should be a relatively simple process but I believe a few things are tied to the kernel version or items built in base.  This may break my GUI temporarily but its not like I haven't been through this breakage a number of times already, and fairly recently.

Once again, first update /usr/src

root@ichigo:/home/tigersharke # cd /usr/src
root@ichigo:/usr/src # git pull
remote: Enumerating objects: 5665, done.
remote: Counting objects: 100% (5649/5649), done.
remote: Compressing objects: 100% (2439/2439), done.
remote: Total 4059 (delta 3169), reused 2269 (delta 1588), pack-reused 0 (from 0)
Receiving objects: 100% (4059/4059), 2.07 MiB | 5.19 MiB/s, done.
Resolving deltas: 100% (3169/3169), completed with 1332 local objects.
From https://github.com/freebsd/freebsd
   3e79ec993..9d84e9cba  stable/15  -> origin/stable/15
Updating 3e79ec993..9d84e9cba
Fast-forward
 .cirrus.yml                                                                                         |    12 +-
 Makefile                                                                                            |     5 +-
 Makefile.inc1                                                                                       |    64 +-
 ObsoleteFiles.inc                                                                                   |    10 +
 UPDATING                                                                                            |    38 +-
 bin/cp/tests/cp_test.sh                                                                             |     8 +-
 bin/ln/tests/ln_test.sh                                                                             |     2 +-
 bin/pwait/pwait.1                                                                                   |     6 +-
 bin/pwait/pwait.c                                                                                   |   102 +-
 bin/pwait/tests/pwait_test.sh                                                                       |    38 +
 cddl/share/zfs/compatibility.d/Makefile                                                             |     5 +-
 contrib/blocklist/Makefile                                                                          |     2 +-
 contrib/blocklist/Makefile.inc                                                                      |     7 +-
 contrib/blocklist/README                                                                            |    52 +-
 contrib/blocklist/TODO                                                                              |    49 +-
 contrib/blocklist/bin/Makefile                                                                      |    12 +-
 contrib/blocklist/bin/blacklistctl.8                                                                |    63 +-
 contrib/blocklist/bin/blacklistctl.c                                                                |    11 +-
 contrib/blocklist/bin/blacklistd.8                                                                  |    54 +-
 contrib/blocklist/bin/blacklistd.c                                                                  |    50 +-
 contrib/blocklist/bin/blacklistd.conf.5                                                             |    71 +-
 contrib/blocklist/bin/blocklistctl.8                                                                |   134 +
 contrib/blocklist/bin/blocklistctl.c                                                                |   170 +
 contrib/blocklist/bin/blocklistd.8                                                                  |   303 +
 contrib/blocklist/bin/blocklistd.c                                                                  |   590 ++
 contrib/blocklist/bin/blocklistd.conf.5                                                             |   237 +
 contrib/blocklist/bin/conf.c                                                                        |   200 +-
 contrib/blocklist/bin/conf.h                                                                        |     3 +-
 contrib/blocklist/bin/internal.c                                                                    |     8 +-
 contrib/blocklist/bin/internal.h                                                                    |     8 +-
 contrib/blocklist/bin/old_internal.c                                                                |    50 +
 contrib/blocklist/bin/old_internal.h                                                                |    58 +
 contrib/blocklist/bin/run.c                                                                         |     9 +-
 contrib/blocklist/bin/run.h                                                                         |     2 +-
 contrib/blocklist/bin/state.c                                                                       |     8 +-
 contrib/blocklist/bin/state.h                                                                       |     2 +-
 contrib/blocklist/bin/support.c                                                                     |    11 +-
 contrib/blocklist/bin/support.h                                                                     |     7 +-
 contrib/blocklist/diff/ftpd.diff                                                                    |    12 +-
 contrib/blocklist/diff/named.diff                                                                   |    12 +-
 contrib/blocklist/diff/postfix.diff                                                                 |    98 +
 contrib/blocklist/diff/proftpd.diff                                                                 |    20 +-
 contrib/blocklist/diff/ssh.diff                                                                     |    14 +-
 contrib/blocklist/etc/Makefile                                                                      |    10 +-
 contrib/blocklist/etc/{blacklistd.conf => blocklistd.conf}                                          |     7 +-
 contrib/blocklist/etc/ipf.conf                                                                      |    45 +
 contrib/blocklist/etc/npf.conf                                                                      |     4 +-
 contrib/blocklist/etc/rc.d/Makefile                                                                 |     4 +-
 contrib/blocklist/etc/rc.d/{blacklistd => blocklistd}                                               |    20 +-
 contrib/blocklist/include/Makefile                                                                  |     4 +-
 contrib/blocklist/include/bl.h                                                                      |    11 +-
 contrib/blocklist/include/blacklist.h                                                               |    16 +-
 contrib/blocklist/include/blocklist.h                                                               |    65 +
 contrib/blocklist/include/old_bl.h                                                                  |    80 +
 contrib/blocklist/lib/Makefile                                                                      |    20 +-
 contrib/blocklist/lib/bl.c                                                                          |   112 +-
 contrib/blocklist/lib/blacklist.c                                                                   |    17 +-
 contrib/blocklist/lib/blocklist.c                                                                   |   117 +
 contrib/blocklist/lib/libblacklist.3                                                                |    37 +-
 contrib/blocklist/lib/libblocklist.3                                                                |   183 +
 contrib/blocklist/lib/old_bl.c                                                                      |   554 ++
 contrib/blocklist/lib/shlib_version                                                                 |     2 +-
 contrib/blocklist/libexec/Makefile                                                                  |     4 +-
 contrib/blocklist/libexec/blacklistd-helper                                                         |   134 -
 contrib/blocklist/libexec/blocklistd-helper                                                         |   272 +
 contrib/blocklist/port/Makefile.am                                                                  |    42 +-
 contrib/blocklist/port/_strtoi.h                                                                    |     2 +-
 contrib/blocklist/port/configure.ac                                                                 |    12 +-
 contrib/blocklist/port/fgetln.c                                                                     |     2 +-
 contrib/blocklist/port/fparseln.c                                                                   |     6 +-
 contrib/blocklist/port/pidfile.c                                                                    |     6 +-
 contrib/blocklist/port/popenve.c                                                                    |     6 +-
 contrib/blocklist/port/port.h                                                                       |    32 +-
 contrib/blocklist/port/sockaddr_snprintf.c                                                          |     6 +-
 contrib/blocklist/port/strlcat.c                                                                    |     7 +-
 contrib/blocklist/port/strlcpy.c                                                                    |     7 +-
 contrib/blocklist/port/strtoi.c                                                                     |     6 +-
 contrib/blocklist/port/vsyslog_r.c                                                                  |    13 +
 contrib/blocklist/test/Makefile                                                                     |     2 +-
 contrib/blocklist/test/cltest.c                                                                     |     6 +-
 contrib/blocklist/test/srvtest.c                                                                    |    42 +-
 contrib/libarchive/NEWS                                                                             |     2 +
 contrib/libarchive/SECURITY.md                                                                      |     2 +-
 contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh                            |     3 +
 contrib/libarchive/cat/bsdcat.c                                                                     |    15 +-
 contrib/libarchive/cat/cmdline.c                                                                    |     2 +-
 contrib/libarchive/cpio/cmdline.c                                                                   |     2 +-
 contrib/libarchive/cpio/cpio.c                                                                      |    14 +-
 contrib/libarchive/cpio/test/test_owner_parse.c                                                     |     2 +-
 contrib/libarchive/libarchive/archive.h                                                             |     4 +-
 contrib/libarchive/libarchive/archive_acl.c                                                         |    23 +
 contrib/libarchive/libarchive/archive_check_magic.c                                                 |     9 +-
 contrib/libarchive/libarchive/archive_cryptor.c                                                     |     8 +-
 contrib/libarchive/libarchive/archive_cryptor_private.h                                             |    11 +-
 contrib/libarchive/libarchive/archive_entry.h                                                       |     2 +-
 contrib/libarchive/libarchive/archive_entry_paths.3                                                 |     2 +-
 contrib/libarchive/libarchive/archive_entry_stat.c                                                  |     6 +-
 contrib/libarchive/libarchive/archive_parse_date.c                                                  |     4 +-
 contrib/libarchive/libarchive/archive_platform.h                                                    |    10 -
 contrib/libarchive/libarchive/archive_platform_stat.h                                               |    45 +
 contrib/libarchive/libarchive/archive_private.h                                                     |     1 +
 contrib/libarchive/libarchive/archive_read.c                                                        |     7 +-
 contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c                                   |    12 +-
 contrib/libarchive/libarchive/archive_read_disk_posix.c                                             |   157 +-
 contrib/libarchive/libarchive/archive_read_open_fd.c                                                |    23 +-
 contrib/libarchive/libarchive/archive_read_open_file.c                                              |    16 +-
 contrib/libarchive/libarchive/archive_read_open_filename.c                                          |    31 +-
 contrib/libarchive/libarchive/archive_read_set_format.c                                             |    32 +-
 contrib/libarchive/libarchive/archive_read_support_filter_program.c                                 |     7 +-
 contrib/libarchive/libarchive/archive_read_support_format_7zip.c                                    |     7 +-
 contrib/libarchive/libarchive/archive_read_support_format_mtree.c                                   |    23 +-
 contrib/libarchive/libarchive/archive_read_support_format_rar.c                                     |     8 +-
 contrib/libarchive/libarchive/archive_read_support_format_rar5.c                                    |    66 +-
 contrib/libarchive/libarchive/archive_read_support_format_tar.c                                     |    70 +-
 contrib/libarchive/libarchive/archive_read_support_format_warc.c                                    |     2 +-
 contrib/libarchive/libarchive/archive_read_support_format_xar.c                                     |     2 +-
 contrib/libarchive/libarchive/archive_read_support_format_zip.c                                     |     4 +-
 contrib/libarchive/libarchive/archive_string.c                                                      |     5 +-
 contrib/libarchive/libarchive/archive_string_sprintf.c                                              |     2 +-
 contrib/libarchive/libarchive/archive_util.c                                                        |    38 +-
 contrib/libarchive/libarchive/archive_write.c                                                       |    30 +-
 contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c                                      |     4 +
 contrib/libarchive/libarchive/archive_write_add_filter_gzip.c                                       |    55 +-
 contrib/libarchive/libarchive/archive_write_add_filter_program.c                                    |    11 +-
 contrib/libarchive/libarchive/archive_write_add_filter_zstd.c                                       |     2 +
 contrib/libarchive/libarchive/archive_write_disk_posix.c                                            |    16 +-
 contrib/libarchive/libarchive/archive_write_open_fd.c                                               |     2 +-
 contrib/libarchive/libarchive/archive_write_open_file.c                                             |    14 +-
 contrib/libarchive/libarchive/archive_write_open_filename.c                                         |     3 +-
 contrib/libarchive/libarchive/archive_write_set_format_7zip.c                                       |     2 +-
 contrib/libarchive/libarchive/archive_write_set_format_mtree.c                                      |    19 +-
 contrib/libarchive/libarchive/archive_write_set_format_xar.c                                        |     6 +-
 contrib/libarchive/libarchive/archive_write_set_format_zip.c                                        |    25 +-
 contrib/libarchive/libarchive/filter_fork_posix.c                                                   |    37 +-
 contrib/libarchive/libarchive/test/test_acl_nfs4.c                                                  |     7 +
 contrib/libarchive/libarchive/test/test_acl_posix1e.c                                               |     5 +
 contrib/libarchive/libarchive/test/test_archive_parse_date.c                                        |     2 +
 contrib/libarchive/libarchive/test/test_archive_string_conversion.c                                 |    10 +
 contrib/libarchive/libarchive/test/test_entry.c                                                     |    11 +
 contrib/libarchive/libarchive/test/test_read_filter_gzip_recursive.c                                |     4 +-
 contrib/libarchive/libarchive/test/test_read_format_7zip.c                                          |    81 +-
 contrib/libarchive/libarchive/test/test_read_format_rar5.c                                          |    66 +
 contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu                             |     6 +
 contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu      |     6 +
 contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu                    |     7 +
 contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu                   |     6 +
 contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c                           |    48 +
 contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu                      |    20 +
 contrib/libarchive/libarchive/test/test_read_set_format.c                                           |     7 +-
 contrib/libarchive/libarchive/test/test_write_filter_bzip2.c                                        |    29 +
 contrib/libarchive/libarchive/test/test_write_filter_gzip.c                                         |    12 +-
 contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c                               |     7 +-
 contrib/libarchive/libarchive_fe/{err.c => lafe_err.c}                                              |     2 +-
 contrib/libarchive/libarchive_fe/{err.h => lafe_err.h}                                              |     0
 contrib/libarchive/libarchive_fe/line_reader.c                                                      |     2 +-
 contrib/libarchive/libarchive_fe/passphrase.c                                                       |     2 +-
 contrib/libarchive/tar/bsdtar.c                                                                     |     7 +-
 contrib/libarchive/tar/bsdtar.h                                                                     |     8 +-
 contrib/libarchive/tar/cmdline.c                                                                    |     2 +-
 contrib/libarchive/tar/creation_set.c                                                               |     2 +-
 contrib/libarchive/tar/read.c                                                                       |     2 +-
 contrib/libarchive/tar/subst.c                                                                      |     2 +-
 contrib/libarchive/tar/test/test_crlf_mtree.c                                                       |    74 +
 contrib/libarchive/tar/test/test_option_safe_writes.c                                               |     5 +-
 contrib/libarchive/tar/util.c                                                                       |     7 +-
 contrib/libarchive/tar/write.c                                                                      |    29 +-
 contrib/libarchive/test_utils/test_common.h                                                         |    10 +-
 contrib/libarchive/test_utils/test_main.c                                                           |   156 +-
 contrib/libarchive/unzip/bsdunzip.c                                                                 |    15 +-
 contrib/libarchive/unzip/cmdline.c                                                                  |     2 +-
 contrib/libarchive/unzip/test/test_C.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_L.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_P_encryption.c                                                   |    12 +-
 contrib/libarchive/unzip/test/test_basic.c                                                          |     4 +
 contrib/libarchive/unzip/test/test_d.c                                                              |     8 +
 contrib/libarchive/unzip/test/test_doubledash.c                                                     |     4 +
 contrib/libarchive/unzip/test/test_glob.c                                                           |     4 +
 contrib/libarchive/unzip/test/test_j.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_n.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_o.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_p.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_q.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_singlefile.c                                                     |     4 +
 contrib/libarchive/unzip/test/test_t.c                                                              |     4 +
 contrib/libarchive/unzip/test/test_x.c                                                              |    12 +
 contrib/netbsd-tests/lib/libc/regex/t_exhaust.c                                                     |    10 +-
 contrib/sendmail/src/newaliases.1                                                                   |     2 +-
 contrib/unbound/Makefile.in                                                                         |  1380 +++--
 contrib/unbound/aclocal.m4                                                                          |   857 +--
 contrib/unbound/cachedb/redis.c                                                                     |   144 +-
 contrib/unbound/compat/fake-rfc2553.c                                                               |     6 +-
 contrib/unbound/config.h.in                                                                         |    22 +-
 contrib/unbound/configure                                                                           |  6438 ++++++++++-----------
 contrib/unbound/configure.ac                                                                        |    30 +-
 contrib/unbound/contrib/aaaa-filter-iterator.patch                                                  |    98 +-
 contrib/unbound/contrib/unbound.service.in                                                          |     6 +
 contrib/unbound/daemon/cachedump.c                                                                  |   339 +-
 contrib/unbound/daemon/remote.c                                                                     |   770 ++-
 contrib/unbound/daemon/stats.c                                                                      |     2 +
 contrib/unbound/daemon/unbound.c                                                                    |     9 +-
 contrib/unbound/daemon/worker.c                                                                     |    19 +-
 contrib/unbound/dns64/dns64.c                                                                       |     2 +-
 contrib/unbound/dnstap/dnstap.c                                                                     |     4 +-
 contrib/unbound/dnstap/dnstap.m4                                                                    |    39 +-
 contrib/unbound/dnstap/dnstap.proto                                                                 |     2 +-
 contrib/unbound/dnstap/dtstream.c                                                                   |     2 +-
 contrib/unbound/doc/Changelog                                                                       |   311 +-
 contrib/unbound/doc/README                                                                          |     2 +-
 contrib/unbound/doc/README.man                                                                      |    16 +
 contrib/unbound/doc/example.conf.in                                                                 |    14 +-
 contrib/unbound/doc/libunbound.3.in                                                                 |   675 ++-
 contrib/unbound/doc/libunbound.rst                                                                  |   491 ++
 contrib/unbound/doc/unbound-anchor.8.in                                                             |   383 +-
 contrib/unbound/doc/unbound-anchor.rst                                                              |   281 +
 contrib/unbound/doc/unbound-checkconf.8.in                                                          |   121 +-
 contrib/unbound/doc/unbound-checkconf.rst                                                           |    98 +
 contrib/unbound/doc/unbound-control.8.in                                                            |  2038 ++++---
 contrib/unbound/doc/unbound-control.rst                                                             |  1375 +++++
 contrib/unbound/doc/unbound-host.1.in                                                               |   242 +-
 contrib/unbound/doc/unbound-host.rst                                                                |   176 +
 contrib/unbound/doc/unbound.8.in                                                                    |   169 +-
 contrib/unbound/doc/unbound.conf.5.in                                                               |  8152 +++++++++++++++++----------
 contrib/unbound/doc/unbound.conf.rst                                                                |  5005 +++++++++++++++++
 contrib/unbound/doc/unbound.rst                                                                     |   119 +
 contrib/unbound/edns-subnet/addrtree.h                                                              |     2 +-
 contrib/unbound/edns-subnet/subnetmod.c                                                             |    47 +-
 contrib/unbound/edns-subnet/subnetmod.h                                                             |     4 +
 contrib/unbound/install-sh                                                                          |   178 +-
 contrib/unbound/iterator/iter_delegpt.h                                                             |    10 +
 contrib/unbound/iterator/iter_fwd.c                                                                 |    32 +-
 contrib/unbound/iterator/iter_scrub.c                                                               |    16 +
 contrib/unbound/iterator/iterator.c                                                                 |    32 +-
 contrib/unbound/libunbound/libworker.c                                                              |    15 +-
 contrib/unbound/libunbound/unbound.h                                                                |     2 +
 contrib/unbound/ltmain.sh                                                                           |    15 +-
 contrib/unbound/respip/respip.h                                                                     |     2 +-
 contrib/unbound/services/authzone.c                                                                 |    90 +-
 contrib/unbound/services/authzone.h                                                                 |    17 +-
 contrib/unbound/services/cache/rrset.c                                                              |     2 +
 contrib/unbound/services/listen_dnsport.c                                                           |   117 +-
 contrib/unbound/services/listen_dnsport.h                                                           |     9 +-
 contrib/unbound/services/mesh.c                                                                     |     1 +
 contrib/unbound/services/mesh.h                                                                     |     2 +
 contrib/unbound/services/modstack.c                                                                 |     4 +-
 contrib/unbound/services/modstack.h                                                                 |     2 +-
 contrib/unbound/services/outside_network.c                                                          |     6 +-
 contrib/unbound/services/rpz.c                                                                      |    20 +-
 contrib/unbound/sldns/keyraw.c                                                                      |     4 +-
 contrib/unbound/sldns/str2wire.c                                                                    |     2 +-
 contrib/unbound/sldns/wire2str.h                                                                    |     2 +-
 contrib/unbound/smallapp/unbound-anchor.c                                                           |    12 +-
 contrib/unbound/smallapp/unbound-checkconf.c                                                        |    51 +-
 contrib/unbound/smallapp/unbound-control.c                                                          |     3 +
 contrib/unbound/testcode/doqclient.c                                                                |    71 +-
 contrib/unbound/testcode/fake_event.c                                                               |    46 +-
 contrib/unbound/testcode/testbound.c                                                                |   150 +-
 contrib/unbound/testcode/unitdname.c                                                                |   277 +
 contrib/unbound/testcode/unitinfra.c                                                                |     1 +
 contrib/unbound/testcode/unitmain.c                                                                 |    24 +
 contrib/unbound/testcode/unitverify.c                                                               |   133 +
 contrib/unbound/testcode/unitzonemd.c                                                               |     1 +
 contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.conf                            |    31 -
 contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.test                            |   493 --
 contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.testns                          |    44 -
 contrib/unbound/testdata/acl_interface.tdir/acl_interface.conf                                      |   198 -
 contrib/unbound/testdata/acl_interface.tdir/acl_interface.test.scenario                             |   268 -
 contrib/unbound/testdata/auth_tls.tdir/auth_tls.pre                                                 |    48 -
 contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.pre                               |    48 -
 contrib/unbound/testdata/cachedb_expired.crpl                                                       |   325 --
 contrib/unbound/testdata/cachedb_expired_reply_ttl.crpl                                             |   260 -
 contrib/unbound/testdata/cachedb_servfail_cname.crpl                                                |   181 -
 contrib/unbound/testdata/cachedb_val_expired.crpl                                                   |   328 --
 contrib/unbound/testdata/common.sh                                                                  |   394 --
 contrib/unbound/testdata/dns_error_reporting.rpl                                                    |   200 -
 contrib/unbound/testdata/dnstap.tdir/dnstap.conf                                                    |    43 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/auth1.zone                                            |     2 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/auth2.zone                                            |     2 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf                                  |   107 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf2                                 |   108 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.dsc                                   |    16 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns1                                   |   339 --
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns2                                   |   285 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.post                                  |    27 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.pre                                   |    56 -
 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.test                                  |   320 --
 contrib/unbound/testdata/fast_reload_most_options.tdir/auth.nlnetlabs.nl.zone                       |     3 -
 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.conf                |   143 -
 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.dsc                 |    16 -
 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.post                |    11 -
 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.pre                 |    33 -
 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.test                |    42 -
 contrib/unbound/testdata/fast_reload_most_options.tdir/rpz.nlnetlabs.nl.zone                        |     5 -
 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.conf                            |    20 -
 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.dsc                             |    16 -
 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.post                            |    11 -
 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.pre                             |    34 -
 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.test                            |    38 -
 contrib/unbound/testdata/fwd_0ttlservfail.rpl                                                       |    87 -
 contrib/unbound/testdata/iter_failreply.rpl                                                         |   131 -
 contrib/unbound/testdata/iter_fwdstubauth.rpl                                                       |   155 -
 contrib/unbound/testdata/iter_scrub_rr_length.rpl                                                   |   297 -
 contrib/unbound/testdata/log_servfail.tdir/log_servfail.conf                                        |    27 -
 contrib/unbound/testdata/log_servfail.tdir/log_servfail.dsc                                         |    16 -
 contrib/unbound/testdata/log_servfail.tdir/log_servfail.post                                        |    10 -
 contrib/unbound/testdata/log_servfail.tdir/log_servfail.pre                                         |    21 -
 contrib/unbound/testdata/log_servfail.tdir/log_servfail.test                                        |    47 -
 contrib/unbound/testdata/redis_replica.tdir/after.zone                                              |     2 -
 contrib/unbound/testdata/redis_replica.tdir/before.zone                                             |     2 -
 contrib/unbound/testdata/redis_replica.tdir/redis.conf                                              |   583 --
 contrib/unbound/testdata/redis_replica.tdir/redis_replica.conf                                      |    31 -
 contrib/unbound/testdata/redis_replica.tdir/redis_replica.dsc                                       |    16 -
 contrib/unbound/testdata/redis_replica.tdir/redis_replica.post                                      |    18 -
 contrib/unbound/testdata/redis_replica.tdir/redis_replica.pre                                       |    46 -
 contrib/unbound/testdata/redis_replica.tdir/redis_replica.test                                      |    78 -
 contrib/unbound/testdata/redis_replica.tdir/unbound_control.key                                     |    39 -
 contrib/unbound/testdata/redis_replica.tdir/unbound_control.pem                                     |    22 -
 contrib/unbound/testdata/redis_replica.tdir/unbound_server.key                                      |    39 -
 contrib/unbound/testdata/redis_replica.tdir/unbound_server.pem                                      |    22 -
 contrib/unbound/testdata/rpz_nsdname.rpl                                                            |   471 --
 contrib/unbound/testdata/rpz_val_block.rpl                                                          |   642 ---
 contrib/unbound/testdata/serve_expired.rpl                                                          |   126 -
 contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl                                              |   154 -
 contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl                                            |   154 -
 contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl                                            |   129 -
 contrib/unbound/testdata/serve_expired_cached_servfail.rpl                                          |   130 -
 contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl                                  |   145 -
 contrib/unbound/testdata/serve_expired_client_timeout_servfail.rpl                                  |   219 -
 contrib/unbound/testdata/serve_expired_client_timeout_val_bogus.rpl                                 |   328 --
 contrib/unbound/testdata/serve_expired_reply_ttl.rpl                                                |   106 -
 contrib/unbound/testdata/serve_expired_ttl.rpl                                                      |   101 -
 contrib/unbound/testdata/serve_expired_ttl_reset.rpl                                                |   101 -
 contrib/unbound/testdata/serve_expired_val_bogus.rpl                                                |   389 --
 contrib/unbound/testdata/serve_expired_zerottl.rpl                                                  |   157 -
 contrib/unbound/testdata/serve_original_ttl.rpl                                                     |   139 -
 contrib/unbound/testdata/stat_values.tdir/stat_values.conf                                          |    44 -
 contrib/unbound/testdata/stat_values.tdir/stat_values.pre                                           |    50 -
 contrib/unbound/testdata/stat_values.tdir/stat_values.test                                          |   680 ---
 contrib/unbound/testdata/stat_values.tdir/stat_values.testns                                        |    82 -
 contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf                                  |    30 -
 contrib/unbound/testdata/stat_values.tdir/stat_values_discard_wait_limit.conf                       |    36 -
 contrib/unbound/testdata/subnet_cached_servfail.crpl                                                |   168 -
 contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl                                 |   168 -
 contrib/unbound/testdata/subnet_global_prefetch_expired.crpl                                        |   242 -
 contrib/unbound/testdata/test_ldnsrr.4                                                              |    80 -
 contrib/unbound/testdata/test_ldnsrr.5                                                              |   178 -
 contrib/unbound/testdata/test_ldnsrr.c3                                                             |  1068 ----
 contrib/unbound/testdata/test_ldnsrr.c4                                                             |    84 -
 contrib/unbound/testdata/test_ldnsrr.c5                                                             |   220 -
 contrib/unbound/testdata/val_failure_dnskey.rpl                                                     |   347 --
 contrib/unbound/testdata/val_scrub_rr_length.rpl                                                    |   163 -
 contrib/unbound/util/config_file.c                                                                  |    65 +-
 contrib/unbound/util/config_file.h                                                                  |    14 +
 contrib/unbound/util/configlexer.c                                                                  |  5634 +++++++++----------
 contrib/unbound/util/configlexer.lex                                                                |     1 +
 contrib/unbound/util/configparser.c                                                                 |  4142 +++++++-------
 contrib/unbound/util/configparser.h                                                                 |    10 +-
 contrib/unbound/util/configparser.y                                                                 |    25 +-
 contrib/unbound/util/data/dname.c                                                                   |    44 +-
 contrib/unbound/util/data/dname.h                                                                   |    15 +-
 contrib/unbound/util/data/msgencode.c                                                               |     6 +-
 contrib/unbound/util/data/msgencode.h                                                               |     2 +-
 contrib/unbound/util/data/msgparse.h                                                                |     6 +-
 contrib/unbound/util/data/msgreply.c                                                                |    27 +-
 contrib/unbound/util/data/msgreply.h                                                                |    12 +-
 contrib/unbound/util/iana_ports.inc                                                                 |     2 +
 contrib/unbound/util/mini_event.c                                                                   |     4 +-
 contrib/unbound/util/net_help.c                                                                     |    21 +-
 contrib/unbound/util/netevent.c                                                                     |    82 +-
 contrib/unbound/util/netevent.h                                                                     |     4 +
 contrib/unbound/util/random.c                                                                       |    33 +
 contrib/unbound/validator/val_sigcrypt.c                                                            |     5 +
 contrib/unbound/validator/validator.c                                                               |    19 +-
 contrib/unbound/winrc/win_svc.c                                                                     |     1 +
 crypto/heimdal/kadmin/dump.c                                                                        |    29 +-
 crypto/heimdal/kadmin/kadmin-commands.in                                                            |     6 +
 crypto/heimdal/kadmin/kadmin.8                                                                      |    29 +-
 crypto/heimdal/kdc/hpropd.c                                                                         |    68 +-
 crypto/heimdal/kdc/mit_dump.c                                                                       |   383 +-
 crypto/heimdal/lib/hdb/Makefile.am                                                                  |     1 +
 crypto/heimdal/lib/hdb/common.c                                                                     |    68 +-
 crypto/heimdal/lib/hdb/ext.c                                                                        |    31 +
 crypto/heimdal/lib/hdb/hdb-mitdb.c                                                                  |   477 +-
 crypto/heimdal/lib/hdb/hdb-protos.h                                                                 |    25 +
 crypto/heimdal/lib/hdb/hdb.asn1                                                                     |    14 +-
 crypto/heimdal/lib/hdb/hdb.c                                                                        |     7 +-
 crypto/heimdal/lib/hdb/hdb.h                                                                        |    15 +-
 crypto/heimdal/lib/hdb/hdb_locl.h                                                                   |     7 +
 crypto/heimdal/lib/hdb/keys.c                                                                       |    69 +-
 crypto/heimdal/lib/hdb/mkey.c                                                                       |   211 +-
 crypto/heimdal/lib/hdb/print.c                                                                      |   407 +-
 crypto/heimdal/lib/hdb/version-script.map                                                           |     6 +
 crypto/heimdal/lib/kadm5/chpass_s.c                                                                 |     7 +
 crypto/heimdal/lib/kadm5/randkey_s.c                                                                |     4 +
 crypto/krb5/src/build-tools/mit-krb5.pc.in                                                          |     2 +-
 crypto/openssh/auth-pam.c                                                                           |     4 +-
 crypto/openssh/auth.c                                                                               |     8 +-
 crypto/openssh/{blacklist.c => blocklist.c}                                                         |    16 +-
 crypto/openssh/{blacklist_client.h => blocklist_client.h}                                           |    30 +-
 crypto/openssh/monitor.c                                                                            |     8 +-
 crypto/openssh/servconf.c                                                                           |    18 +-
 crypto/openssh/servconf.h                                                                           |     2 +-
 crypto/openssh/sshd-session.c                                                                       |    10 +-
 crypto/openssh/sshd_config                                                                          |     2 +-
 crypto/openssh/sshd_config.5                                                                        |    14 +-
 etc/Makefile                                                                                        |     2 +-
 etc/mtree/BSD.include.dist                                                                          |    10 +-
 etc/mtree/BSD.root.dist                                                                             |    90 +-
 etc/mtree/BSD.tests.dist                                                                            |     2 +
 etc/mtree/BSD.usr.dist                                                                              |    18 +-
 etc/mtree/BSD.var.dist                                                                              |     6 +-
 include/resolv.h                                                                                    |     4 +-
 include/stdckdint.h                                                                                 |     6 +-
 kerberos5/lib/libhdb/Makefile                                                                       |     5 +-
 lib/Makefile                                                                                        |     1 +
 lib/geom/Makefile.inc                                                                               |    11 +-
 lib/libarchive/Makefile                                                                             |     9 +-
 lib/libarchive/tests/Makefile                                                                       |     6 +
 lib/libblacklist/Makefile                                                                           |     7 +-
 lib/libblocklist/Makefile                                                                           |    30 +
 lib/libblocklist/Makefile.depend                                                                    |    16 +
 lib/libbluetooth/Makefile                                                                           |     2 +
 lib/libbz2/Makefile                                                                                 |    13 +
 lib/libbz2/bzip2.pc.in                                                                              |    11 +
 lib/libc/Makefile                                                                                   |     1 -
 lib/libc/gen/_rand48.c                                                                              |    34 +-
 lib/libc/gen/drand48.c                                                                              |     6 +-
 lib/libc/gen/erand48.c                                                                              |     9 +-
 lib/libc/gen/fts.3                                                                                  |   195 +-
 lib/libc/gen/fts.c                                                                                  |     3 -
 lib/libc/gen/getgrouplist.3                                                                         |    33 +-
 lib/libc/gen/getvfsbyname.3                                                                         |     3 +-
 lib/libc/gen/initgroups.3                                                                           |     8 +-
 lib/libc/gen/jrand48.c                                                                              |     7 +-
 lib/libc/gen/lcong48.c                                                                              |    12 +-
 lib/libc/gen/lrand48.c                                                                              |     6 +-
 lib/libc/gen/mrand48.c                                                                              |     8 +-
 lib/libc/gen/nrand48.c                                                                              |     6 +-
 lib/libc/gen/rand48.3                                                                               |     5 +-
 lib/libc/gen/rand48.h                                                                               |    61 +-
 lib/libc/gen/seed48.c                                                                               |    18 +-
 lib/libc/gen/srand48.c                                                                              |    13 +-
 lib/libc/include/port_before.h                                                                      |     1 -
 lib/libc/inet/inet_net_ntop.c                                                                       |   206 +-
 lib/libc/inet/inet_net_pton.c                                                                       |   363 +-
 lib/libc/locale/Makefile.inc                                                                        |     2 +-
 lib/libc/md/Makefile.inc                                                                            |     3 -
 lib/libc/posix1e/Makefile.inc                                                                       |     3 +-
 lib/libc/regex/Makefile.inc                                                                         |     8 +-
 lib/libc/resolv/Symbol.map                                                                          |     1 -
 lib/libc/resolv/res_init.c                                                                          |    61 +-
 lib/libc/rpc/Makefile.inc                                                                           |     4 +-
 lib/libc/stdlib/realpath.3                                                                          |    12 +-
 lib/libc/stdlib/realpath.c                                                                          |    14 +-
 lib/libc/stdtime/strptime.3                                                                         |     2 +-
 lib/libc/stdtime/strptime.c                                                                         |     3 +-
 lib/libc/string/ffs.3                                                                               |    13 +-
 lib/libc/tests/gen/realpath2_test.c                                                                 |   106 +-
 lib/libc/tests/net/Makefile                                                                         |     2 +
 lib/libc/tests/net/inet_net_test.cc                                                                 |   333 ++
 lib/libcasper/services/cap_fileargs/cap_fileargs.h                                                  |     2 +-
 lib/libedit/Makefile                                                                                |     6 +-
 lib/libmagic/Makefile                                                                               |     8 +-
 lib/libmd/aarch64/sha1block.S                                                                       |     2 +-
 lib/libmd/aarch64/sha1dispatch.c                                                                    |     2 +-
 lib/libmd/amd64/sha1block.S                                                                         |     2 +-
 lib/libmd/amd64/sha1dispatch.c                                                                      |     2 +-
 lib/libmd/sha1c.c                                                                                   |     2 +-
 lib/libpam/libpam/Makefile                                                                          |     6 +-
 lib/libpam/static_libpam/Makefile                                                                   |     1 +
 lib/libpcap/Makefile                                                                                |    13 +-
 lib/libpfctl/libpfctl.c                                                                             |     3 +
 lib/libradius/Makefile                                                                              |     4 +-
 lib/libsamplerate/Makefile                                                                          |     2 +-
 lib/libsys/closefrom.2                                                                              |     7 +-
 lib/libsys/getgroups.2                                                                              |    25 +-
 lib/libsys/getrlimitusage.2                                                                         |     4 +-
 lib/libsys/socket.2                                                                                 |   300 +-
 lib/libsys/write.2                                                                                  |    20 +
 lib/libsysdecode/Makefile.depend                                                                    |     2 +-
 lib/libtacplus/Makefile                                                                             |     4 +-
 lib/libunbound/Makefile                                                                             |     6 +-
 lib/libunbound/config.h                                                                             |     4 +-
 lib/libutil/Makefile                                                                                |     3 +-
 lib/libwrap/Makefile                                                                                |    17 +-
 lib/libxo/libxo/Makefile                                                                            |     2 +-
 lib/libz/Makefile                                                                                   |     5 +-
 lib/msun/src/e_remainder.c                                                                          |     4 +-
 lib/ncurses/Makefile.inc                                                                            |     1 +
 lib/ncurses/tinfo/Makefile                                                                          |     6 +-
 lib/nss_tacplus/Makefile                                                                            |     4 +-
 lib/virtual_oss/Makefile.inc                                                                        |     2 +
 libexec/Makefile                                                                                    |     7 +-
 libexec/blacklistd-helper/Makefile                                                                  |     7 -
 libexec/blocklistd-helper/Makefile                                                                  |    10 +
 libexec/{blacklistd-helper => blocklistd-helper}/Makefile.depend                                    |     0
 libexec/blocklistd-helper/blacklistd-helper                                                         |   293 +
 libexec/fingerd/Makefile                                                                            |     8 +-
 libexec/fingerd/Makefile.depend.options                                                             |     2 +-
 libexec/fingerd/fingerd.c                                                                           |    16 +-
 libexec/flua/Makefile                                                                               |     2 +
 libexec/flua/Makefile.inc                                                                           |     2 +
 libexec/kgdb/Makefile                                                                               |     5 -
 libexec/nuageinit/nuage.lua                                                                         |    61 +-
 libexec/rc/rc.conf                                                                                  |    12 +-
 libexec/rc/rc.d/Makefile                                                                            |   465 +-
 libexec/rc/rc.d/blacklistd                                                                          |    12 +-
 libexec/rc/rc.d/blocklistd                                                                          |    46 +
 libexec/rc/rc.d/dmesg                                                                               |     2 +-
 libexec/rc/rc.d/hostapd                                                                             |     9 -
 libexec/rc/rc.d/netwait                                                                             |    86 +-
 libexec/rc/rc.d/virtual_oss                                                                         |     4 +-
 libexec/rc/rc.d/zpoolreguid                                                                         |     2 +-
 libexec/rc/rc.d/zpoolupgrade                                                                        |     2 +-
 libexec/rc/rc.subr                                                                                  |    29 +-
 libexec/rc/tests/rc_subr_test.sh                                                                    |    12 +
 release/Makefile                                                                                    |    21 +-
 release/Makefile.mirrors                                                                            |    23 +-
 release/Makefile.oracle                                                                             |    19 +-
 release/Makefile.vm                                                                                 |     3 +
 release/arm64/RPI.conf                                                                              |     5 +-
 release/packages/generate-set-ucl.lua                                                               |    18 +-
 release/packages/generate-ucl.lua                                                                   |    12 +-
 release/packages/set-template.ucl                                                                   |     2 +-
 release/packages/sets/base-dbg.ucl                                                                  |     2 -
 release/packages/sets/base-jail-dbg.ucl                                                             |     2 -
 release/packages/sets/base-jail.ucl                                                                 |     3 -
 release/packages/sets/base.ucl                                                                      |     3 -
 release/packages/sets/optional-dbg.ucl                                                              |     1 -
 release/packages/sets/optional-jail-dbg.ucl                                                         |     1 -
 release/packages/sets/optional-jail.ucl                                                             |     1 -
 release/packages/sets/optional.ucl                                                                  |     1 -
 release/packages/ucl/acpi-all.ucl                                                                   |     2 +-
 release/packages/ucl/at.ucl                                                                         |     2 -
 release/packages/ucl/audit-all.ucl                                                                  |     2 +-
 release/packages/ucl/blocklist-all.ucl                                                              |     8 +-
 release/packages/ucl/bluetooth.ucl                                                                  |     1 -
 release/packages/ucl/bsdconfig.ucl                                                                  |     1 -
 release/packages/ucl/bsdinstall.ucl                                                                 |     6 +-
 release/packages/ucl/caroot.ucl                                                                     |     5 +-
 release/packages/ucl/certctl.ucl                                                                    |     1 -
 release/packages/ucl/clang.ucl                                                                      |     2 -
 release/packages/ucl/ctf-all.ucl                                                                    |     2 +-
 release/packages/ucl/devd.ucl                                                                       |     1 -
 release/packages/ucl/dhclient-all.ucl                                                               |     2 +-
 release/packages/ucl/dhclient.ucl                                                                   |    26 +
 release/packages/ucl/fetch-all.ucl                                                                  |     4 +-
 release/packages/ucl/flua-all.ucl                                                                   |    32 +
 release/packages/ucl/libbegemot-all.ucl                                                             |     4 +-
 release/packages/ucl/libbsdstat-all.ucl                                                             |     2 +-
 release/packages/ucl/{unbound-all.ucl => local-unbound-all.ucl}                                     |     0
 release/packages/ucl/local-unbound.ucl                                                              |    35 +
 release/packages/ucl/mandoc-all.ucl                                                                 |     2 +-
 release/packages/ucl/ncurses-all.ucl                                                                |     4 +
 release/packages/ucl/newsyslog.ucl                                                                  |     1 -
 release/packages/ucl/nuageinit-all.ucl                                                              |     7 +
 release/packages/ucl/openssl-all.ucl                                                                |     2 +-
 release/packages/ucl/periodic.ucl                                                                   |     1 -
 release/packages/ucl/rc.ucl                                                                         |     1 -
 release/packages/ucl/rcmds.ucl                                                                      |     1 -
 release/packages/ucl/sendmail.ucl                                                                   |     1 -
 release/packages/ucl/tests-all.ucl                                                                  |     3 -
 release/packages/ucl/tests.ucl                                                                      |    27 +
 release/packages/ucl/ufs-all.ucl                                                                    |     2 +-
 release/packages/ucl/xz-all.ucl                                                                     |     2 +-
 release/packages/ucl/yp-all.ucl                                                                     |     2 +-
 release/packages/ucl/yp.ucl                                                                         |     1 -
 release/packages/ucl/zfs-all.ucl                                                                    |     2 +-
 release/packages/ucl/zlib-all.ucl                                                                   |    32 +
 release/scripts/make-oci-image.sh                                                                   |    10 +-
 release/scripts/mtree-to-plist.awk                                                                  |     6 -
 release/scripts/pkg-stage.sh                                                                        |     2 +-
 release/tools/ec2-base.conf                                                                         |     4 +
 release/tools/ec2-builder.conf                                                                      |    10 +-
 release/tools/ec2-small.conf                                                                        |    10 +-
 release/tools/oci-image-notoolchain.conf                                                            |    54 +-
 release/tools/oci-image-runtime.conf                                                                |     4 +
 release/tools/vagrant.conf                                                                          |    25 +-
 release/tools/vmimage.subr                                                                          |    66 +-
 sbin/bsdlabel/bsdlabel.8                                                                            |     2 +-
 sbin/bsdlabel/bsdlabel.c                                                                            |     2 +-
 sbin/devd/snd.conf                                                                                  |     5 +-
 sbin/fdisk/fdisk.8                                                                                  |     4 +-
 sbin/fdisk/fdisk.c                                                                                  |     2 +-
 sbin/fsck_ffs/setup.c                                                                               |    47 -
 sbin/ifconfig/ifconfig.8                                                                            |     4 +-
 sbin/ipf/libipf/printdstl_live.c                                                                    |     3 +
 sbin/ipf/libipf/printdstlist.c                                                                      |     2 +
 sbin/ipf/libipf/printdstlistdata.c                                                                  |     5 +-
 sbin/ipf/libipf/printhash_live.c                                                                    |     8 +-
 sbin/ipf/libipf/printhashdata.c                                                                     |    19 +-
 sbin/ipf/libipf/printpooldata.c                                                                     |     2 +
 sbin/ipfw/dummynet.c                                                                                |     4 +-
 sbin/ipfw/ipfw2.c                                                                                   |     8 +-
 sbin/ipfw/tables.c                                                                                  |     3 -
 sbin/mount/mount.8                                                                                  |     3 +-
 sbin/mount_nullfs/mount_nullfs.8                                                                    |    28 +-
 sbin/pfctl/pfctl.c                                                                                  |     5 +-
 sbin/ping/tests/Makefile                                                                            |     3 +-
 sbin/rcorder/rcorder.c                                                                              |     8 +-
 secure/lib/libpkgecc/Makefile                                                                       |     1 -
 secure/libexec/sshd-auth/Makefile                                                                   |    10 +-
 secure/libexec/sshd-session/Makefile                                                                |    10 +-
 secure/usr.sbin/sshd/Makefile.depend.options                                                        |     2 +-
 share/examples/bhyve/vmrun.sh                                                                       |     6 +-
 share/examples/mdoc/example.1                                                                       |    23 +-
 share/examples/mdoc/example.3                                                                       |    23 +-
 share/examples/mdoc/example.4                                                                       |    23 +-
 share/examples/mdoc/example.9                                                                       |    23 +-
 share/man/man3/Makefile                                                                             |     1 +
 share/man/man3/queue.3                                                                              |     6 +-
 share/man/man3/siginfo.3                                                                            |     2 +-
 share/man/man4/Makefile                                                                             |    17 +-
 share/man/man4/aacraid.4                                                                            |    12 +-
 share/man/man4/acpi_battery.4                                                                       |     4 +-
 share/man/man4/agp.4                                                                                |     4 +-
 share/man/man4/ahc.4                                                                                |     2 +-
 share/man/man4/{man4.arm => }/aw_gpio.4                                                             |     2 +-
 share/man/man4/{man4.arm => }/aw_mmc.4                                                              |     6 +-
 share/man/man4/{man4.arm => }/aw_rtc.4                                                              |     2 +-
 share/man/man4/{man4.arm => }/aw_sid.4                                                              |     2 +-
 share/man/man4/{man4.arm => }/aw_spi.4                                                              |     2 +-
 share/man/man4/{man4.arm => }/aw_syscon.4                                                           |     2 +-
 share/man/man4/bce.4                                                                                |     2 +-
 share/man/man4/ice.4                                                                                |    30 +-
 share/man/man4/iwlwifi.4                                                                            |     2 +-
 share/man/man4/le.4                                                                                 |     4 +-
 share/man/man4/linprocfs.4                                                                          |     4 +-
 share/man/man4/linsysfs.4                                                                           |     4 +-
 share/man/man4/mac_do.4                                                                             |     2 +-
 share/man/man4/man4.aarch64/Makefile                                                                |     6 -
 share/man/man4/man4.arm/Makefile                                                                    |     6 -
 share/man/man4/nvd.4                                                                                |     6 +-
 share/man/man4/p9fs.4                                                                               |     2 +-
 share/man/man4/rights.4                                                                             |     3 +-
 share/man/man4/snd_dummy.4                                                                          |    17 +-
 share/man/man4/umass.4                                                                              |    56 +-
 share/man/man4/upgt.4                                                                               |     4 +-
 share/man/man4/usbhid.4                                                                             |     2 +
 share/man/man5/Makefile                                                                             |    70 +-
 share/man/man5/periodic.conf.5                                                                      |     2 +-
 share/man/man5/pf.conf.5                                                                            |     8 +-
 share/man/man5/rc.conf.5                                                                            |    31 +-
 share/man/man5/src.conf.5                                                                           |    43 +-
 share/man/man5/style.mdoc.5                                                                         |    30 +-
 share/man/man7/d.7                                                                                  |     4 +-
 share/man/man7/release.7                                                                            |    18 +-
 share/man/man7/stats.7                                                                              |     3 +-
 share/man/man7/tuning.7                                                                             |     3 +-
 share/man/man8/debug.sh.8                                                                           |     4 +-
 share/man/man8/rc.subr.8                                                                            |     2 +-
 share/man/man9/Makefile                                                                             |     2 +-
 share/man/man9/g_bio.9                                                                              |     3 +-
 share/man/man9/insmntque.9                                                                          |     6 +-
 share/man/man9/uio.9                                                                                |    14 +-
 share/misc/bsd-family-tree                                                                          |     5 +-
 share/mk/bsd.confs.mk                                                                               |     8 +
 share/mk/bsd.lib.mk                                                                                 |    13 +-
 share/mk/bsd.libnames.mk                                                                            |     1 +
 share/mk/bsd.man.mk                                                                                 |    34 +-
 share/mk/local.dirdeps-options.mk                                                                   |     1 +
 share/mk/src.libnames.mk                                                                            |    14 +-
 share/mk/src.opts.mk                                                                                |    10 +
 stand/Makefile.inc                                                                                  |     2 +
 stand/lua/cli.lua.8                                                                                 |    18 +-
 stand/userboot/Makefile.inc                                                                         |     4 +
 sys/amd64/amd64/trap.c                                                                              |     4 +-
 sys/amd64/conf/GENERIC                                                                              |     1 -
 sys/amd64/conf/MINIMAL                                                                              |     1 -
 sys/amd64/include/vmm.h                                                                             |    99 +-
 sys/amd64/pt/pt.c                                                                                   |   221 +-
 sys/amd64/vmm/vmm.c                                                                                 |    47 +-
 sys/amd64/vmm/vmm_dev_machdep.c                                                                     |     1 +
 sys/arm/conf/GENERIC                                                                                |     4 -
 sys/arm/conf/NOTES                                                                                  |     5 -
 sys/arm/include/ieeefp.h                                                                            |    10 +
 sys/arm64/arm64/elf32_machdep.c                                                                     |     2 +-
 sys/arm64/include/armreg.h                                                                          |     5 +
 sys/arm64/include/hypervisor.h                                                                      |    96 +-
 sys/arm64/include/vmm.h                                                                             |    32 +-
 sys/arm64/vmm/arm64.h                                                                               |    38 +-
 sys/arm64/vmm/vmm.c                                                                                 |    71 +-
 sys/arm64/vmm/vmm_hyp.c                                                                             |    19 +-
 sys/arm64/vmm/vmm_reset.c                                                                           |     7 +-
 sys/cam/ata/ata_da.c                                                                                |     4 +-
 sys/cam/scsi/scsi_da.c                                                                              |     4 +-
 sys/compat/linprocfs/linprocfs.c                                                                    |    77 +-
 sys/compat/linuxkpi/common/include/linux/bitops.h                                                   |     9 +-
 sys/compat/linuxkpi/common/include/linux/compiler.h                                                 |     8 +
 sys/compat/linuxkpi/common/include/linux/device.h                                                   |     1 +
 sys/compat/linuxkpi/common/include/linux/etherdevice.h                                              |    23 +
 sys/compat/linuxkpi/common/include/linux/fips.h                                                     |    12 +
 sys/compat/linuxkpi/common/include/linux/ieee80211.h                                                |     2 +
 sys/compat/linuxkpi/common/include/linux/netdevice.h                                                |    15 +
 sys/compat/linuxkpi/common/include/linux/nl80211.h                                                  |    10 +
 sys/compat/linuxkpi/common/include/linux/pci.h                                                      |    13 +
 sys/compat/linuxkpi/common/include/linux/platform_device.h                                          |     2 +-
 sys/compat/linuxkpi/common/include/linux/skbuff.h                                                   |     3 +
 sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h                                     |    47 +-
 sys/compat/linuxkpi/common/include/net/cfg80211.h                                                   |   320 +-
 sys/compat/linuxkpi/common/include/net/mac80211.h                                                   |    51 +-
 sys/compat/linuxkpi/common/include/net/netmem.h                                                     |    21 +
 sys/compat/linuxkpi/common/include/net/page_pool.h                                                  |   119 -
 sys/compat/linuxkpi/common/include/net/page_pool/helpers.h                                          |    79 +
 sys/compat/linuxkpi/common/include/net/page_pool/types.h                                            |    36 +
 sys/compat/linuxkpi/common/src/linux_80211.c                                                        |    12 +-
 sys/compat/linuxkpi/common/src/linux_80211_macops.c                                                 |    14 +-
 sys/conf/NOTES                                                                                      |     2 +-
 sys/conf/dtb.build.mk                                                                               |     9 +-
 sys/conf/dtb.mk                                                                                     |     2 +
 sys/conf/files                                                                                      |     1 -
 sys/conf/files.amd64                                                                                |     3 +-
 sys/conf/files.arm                                                                                  |     2 +-
 sys/conf/files.i386                                                                                 |     1 +
 sys/conf/files.powerpc                                                                              |     3 +
 sys/conf/files.x86                                                                                  |     2 +-
 sys/conf/kern.post.mk                                                                               |    15 +
 sys/conf/newvers.sh                                                                                 |     2 +-
 sys/contrib/dev/iwlwifi/cfg/22000.c                                                                 |   397 +-
 sys/contrib/dev/iwlwifi/cfg/7000.c                                                                  |   173 +-
 sys/contrib/dev/iwlwifi/cfg/8000.c                                                                  |    92 +-
 sys/contrib/dev/iwlwifi/cfg/9000.c                                                                  |   168 +-
 sys/contrib/dev/iwlwifi/cfg/ax210.c                                                                 |   297 +-
 sys/contrib/dev/iwlwifi/cfg/bz.c                                                                    |   198 +-
 sys/contrib/dev/iwlwifi/cfg/dr.c                                                                    |    93 +
 sys/contrib/dev/iwlwifi/cfg/rf-fm.c                                                                 |    51 +
 sys/contrib/dev/iwlwifi/cfg/rf-gf.c                                                                 |    73 +
 sys/contrib/dev/iwlwifi/cfg/rf-hr.c                                                                 |    89 +
 sys/contrib/dev/iwlwifi/cfg/rf-jf.c                                                                 |   111 +
 sys/contrib/dev/iwlwifi/cfg/rf-pe.c                                                                 |    16 +
 sys/contrib/dev/iwlwifi/cfg/rf-wh.c                                                                 |    15 +
 sys/contrib/dev/iwlwifi/cfg/sc.c                                                                    |   201 +-
 sys/contrib/dev/iwlwifi/fw/acpi.c                                                                   |   253 +-
 sys/contrib/dev/iwlwifi/fw/acpi.h                                                                   |    60 +-
 sys/contrib/dev/iwlwifi/fw/api/alive.h                                                              |    29 +-
 sys/contrib/dev/iwlwifi/fw/api/binding.h                                                            |     2 -
 sys/contrib/dev/iwlwifi/fw/api/coex.h                                                               |    29 +-
 sys/contrib/dev/iwlwifi/fw/api/commands.h                                                           |    31 +-
 sys/contrib/dev/iwlwifi/fw/api/context.h                                                            |     9 +-
 sys/contrib/dev/iwlwifi/fw/api/d3.h                                                                 |   196 +-
 sys/contrib/dev/iwlwifi/fw/api/datapath.h                                                           |    11 +-
 sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h                                                            |    13 +-
 sys/contrib/dev/iwlwifi/fw/api/debug.h                                                              |    48 +-
 sys/contrib/dev/iwlwifi/fw/api/dhc.h                                                                |   230 +
 sys/contrib/dev/iwlwifi/fw/api/location.h                                                           |   179 +-
 sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h                                                            |   394 +-
 sys/contrib/dev/iwlwifi/fw/api/mac.h                                                                |    14 +-
 sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h                                                            |    62 +-
 sys/contrib/dev/iwlwifi/fw/api/offload.h                                                            |    12 +-
 sys/contrib/dev/iwlwifi/fw/api/phy-ctxt.h                                                           |     9 +-
 sys/contrib/dev/iwlwifi/fw/api/phy.h                                                                |    25 +-
 sys/contrib/dev/iwlwifi/fw/api/power.h                                                              |   171 +-
 sys/contrib/dev/iwlwifi/fw/api/rs.h                                                                 |   135 +-
 sys/contrib/dev/iwlwifi/fw/api/rx.h                                                                 |    54 +-
 sys/contrib/dev/iwlwifi/fw/api/scan.h                                                               |    46 +-
 sys/contrib/dev/iwlwifi/fw/api/sta.h                                                                |     1 +
 sys/contrib/dev/iwlwifi/fw/api/stats.h                                                              |    17 +-
 sys/contrib/dev/iwlwifi/fw/api/tdls.h                                                               |    12 +-
 sys/contrib/dev/iwlwifi/fw/api/time-event.h                                                         |    60 +-
 sys/contrib/dev/iwlwifi/fw/api/tx.h                                                                 |   105 +-
 sys/contrib/dev/iwlwifi/fw/dbg.c                                                                    |   350 +-
 sys/contrib/dev/iwlwifi/fw/dbg.h                                                                    |    20 +-
 sys/contrib/dev/iwlwifi/fw/debugfs.c                                                                |    50 +-
 sys/contrib/dev/iwlwifi/fw/dhc-utils.h                                                              |    75 +
 sys/contrib/dev/iwlwifi/fw/dump.c                                                                   |    44 +-
 sys/contrib/dev/iwlwifi/fw/error-dump.h                                                             |     9 +-
 sys/contrib/dev/iwlwifi/fw/file.h                                                                   |    45 +-
 sys/contrib/dev/iwlwifi/fw/img.c                                                                    |     2 +
 sys/contrib/dev/iwlwifi/fw/img.h                                                                    |    12 +-
 sys/contrib/dev/iwlwifi/fw/init.c                                                                   |    24 +-
 sys/contrib/dev/iwlwifi/fw/paging.c                                                                 |     6 +-
 sys/contrib/dev/iwlwifi/fw/pnvm.c                                                                   |    79 +-
 sys/contrib/dev/iwlwifi/fw/pnvm.h                                                                   |     5 +-
 sys/contrib/dev/iwlwifi/fw/regulatory.c                                                             |   200 +-
 sys/contrib/dev/iwlwifi/fw/regulatory.h                                                             |    90 +-
 sys/contrib/dev/iwlwifi/fw/rs.c                                                                     |   137 +-
 sys/contrib/dev/iwlwifi/fw/runtime.h                                                                |    19 +-
 sys/contrib/dev/iwlwifi/fw/smem.c                                                                   |     4 +-
 sys/contrib/dev/iwlwifi/fw/uefi.c                                                                   |   225 +-
 sys/contrib/dev/iwlwifi/fw/uefi.h                                                                   |    93 +-
 sys/contrib/dev/iwlwifi/iwl-config.h                                                                |   508 +-
 sys/contrib/dev/iwlwifi/iwl-csr.h                                                                   |    48 +-
 sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c                                                               |    20 +-
 sys/contrib/dev/iwlwifi/iwl-debug.h                                                                 |    14 +-
 sys/contrib/dev/iwlwifi/iwl-drv.c                                                                   |   337 +-
 sys/contrib/dev/iwlwifi/iwl-drv.h                                                                   |     9 +-
 sys/contrib/dev/iwlwifi/iwl-fh.h                                                                    |    30 +-
 sys/contrib/dev/iwlwifi/iwl-io.c                                                                    |    42 +-
 sys/contrib/dev/iwlwifi/iwl-io.h                                                                    |    23 +-
 sys/contrib/dev/iwlwifi/iwl-nvm-parse.c                                                             |   246 +-
 sys/contrib/dev/iwlwifi/iwl-nvm-parse.h                                                             |    16 +-
 sys/contrib/dev/iwlwifi/iwl-nvm-utils.c                                                             |    17 +-
 sys/contrib/dev/iwlwifi/iwl-op-mode.h                                                               |   106 +-
 sys/contrib/dev/iwlwifi/iwl-prph.h                                                                  |    15 +-
 sys/contrib/dev/iwlwifi/iwl-trans.c                                                                 |   484 +-
 sys/contrib/dev/iwlwifi/iwl-trans.h                                                                 |   346 +-
 sys/contrib/dev/iwlwifi/iwl-utils.c                                                                 |   195 +
 sys/contrib/dev/iwlwifi/iwl-utils.h                                                                 |    58 +
 sys/contrib/dev/iwlwifi/mld/Makefile                                                                |    12 +
 sys/contrib/dev/iwlwifi/mld/agg.c                                                                   |   680 +++
 sys/contrib/dev/iwlwifi/mld/agg.h                                                                   |   127 +
 sys/contrib/dev/iwlwifi/mld/ap.c                                                                    |   363 ++
 sys/contrib/dev/iwlwifi/mld/ap.h                                                                    |    45 +
 sys/contrib/dev/iwlwifi/mld/coex.c                                                                  |    40 +
 sys/contrib/dev/iwlwifi/mld/coex.h                                                                  |    15 +
 sys/contrib/dev/iwlwifi/mld/constants.h                                                             |    79 +
 sys/contrib/dev/iwlwifi/mld/d3.c                                                                    |  1906 +++++++
 sys/contrib/dev/iwlwifi/mld/d3.h                                                                    |    51 +
 sys/contrib/dev/iwlwifi/mld/debugfs.c                                                               |  1109 ++++
 sys/contrib/dev/iwlwifi/mld/debugfs.h                                                               |   244 +
 sys/contrib/dev/iwlwifi/mld/ftm-initiator.c                                                         |   451 ++
 sys/contrib/dev/iwlwifi/mld/ftm-initiator.h                                                         |    29 +
 sys/contrib/dev/iwlwifi/mld/fw.c                                                                    |   554 ++
 sys/contrib/dev/iwlwifi/mld/hcmd.h                                                                  |    56 +
 sys/contrib/dev/iwlwifi/mld/iface.c                                                                 |   707 +++
 sys/contrib/dev/iwlwifi/mld/iface.h                                                                 |   253 +
 sys/contrib/dev/iwlwifi/mld/key.c                                                                   |   370 ++
 sys/contrib/dev/iwlwifi/mld/key.h                                                                   |    39 +
 sys/contrib/dev/iwlwifi/mld/led.c                                                                   |   100 +
 sys/contrib/dev/iwlwifi/mld/led.h                                                                   |    29 +
 sys/contrib/dev/iwlwifi/mld/link.c                                                                  |   895 +++
 sys/contrib/dev/iwlwifi/mld/link.h                                                                  |   129 +
 sys/contrib/dev/iwlwifi/mld/low_latency.c                                                           |   336 ++
 sys/contrib/dev/iwlwifi/mld/low_latency.h                                                           |    68 +
 sys/contrib/dev/iwlwifi/mld/mac80211.c                                                              |  2672 +++++++++
 sys/contrib/dev/iwlwifi/mld/mac80211.h                                                              |    13 +
 sys/contrib/dev/iwlwifi/mld/mcc.c                                                                   |   285 +
 sys/contrib/dev/iwlwifi/mld/mcc.h                                                                   |    17 +
 sys/contrib/dev/iwlwifi/mld/mld.c                                                                   |   771 +++
 sys/contrib/dev/iwlwifi/mld/mld.h                                                                   |   592 ++
 sys/contrib/dev/iwlwifi/mld/mlo.c                                                                   |  1225 ++++
 sys/contrib/dev/iwlwifi/mld/mlo.h                                                                   |   171 +
 sys/contrib/dev/iwlwifi/mld/notif.c                                                                 |   725 +++
 sys/contrib/dev/iwlwifi/mld/notif.h                                                                 |    35 +
 sys/contrib/dev/iwlwifi/mld/phy.c                                                                   |   198 +
 sys/contrib/dev/iwlwifi/mld/phy.h                                                                   |    60 +
 sys/contrib/dev/iwlwifi/mld/power.c                                                                 |   391 ++
 sys/contrib/dev/iwlwifi/mld/power.h                                                                 |    33 +
 sys/contrib/dev/iwlwifi/mld/ptp.c                                                                   |   321 ++
 sys/contrib/dev/iwlwifi/mld/ptp.h                                                                   |    45 +
 sys/contrib/dev/iwlwifi/mld/regulatory.c                                                            |   369 ++
 sys/contrib/dev/iwlwifi/mld/regulatory.h                                                            |    23 +
 sys/contrib/dev/iwlwifi/mld/roc.c                                                                   |   265 +
 sys/contrib/dev/iwlwifi/mld/roc.h                                                                   |    20 +
 sys/contrib/dev/iwlwifi/mld/rx.c                                                                    |  2137 +++++++
 sys/contrib/dev/iwlwifi/mld/rx.h                                                                    |    72 +
 sys/contrib/dev/iwlwifi/mld/scan.c                                                                  |  2181 ++++++++
 sys/contrib/dev/iwlwifi/mld/scan.h                                                                  |   173 +
 sys/contrib/dev/iwlwifi/mld/session-protect.c                                                       |   222 +
 sys/contrib/dev/iwlwifi/mld/session-protect.h                                                       |   102 +
 sys/contrib/dev/iwlwifi/mld/sta.c                                                                   |  1321 +++++
 sys/contrib/dev/iwlwifi/mld/sta.h                                                                   |   273 +
 sys/contrib/dev/iwlwifi/mld/stats.c                                                                 |   518 ++
 sys/contrib/dev/iwlwifi/mld/stats.h                                                                 |    22 +
 sys/contrib/dev/iwlwifi/mld/tests/Makefile                                                          |     5 +
 sys/contrib/dev/iwlwifi/mld/tests/agg.c                                                             |   663 +++
 sys/contrib/dev/iwlwifi/mld/tests/hcmd.c                                                            |    62 +
 sys/contrib/dev/iwlwifi/mld/tests/link-selection.c                                                  |   339 ++
 sys/contrib/dev/iwlwifi/mld/tests/link.c                                                            |   110 +
 sys/contrib/dev/iwlwifi/mld/tests/module.c                                                          |    11 +
 sys/contrib/dev/iwlwifi/mld/tests/rx.c                                                              |   353 ++
 sys/contrib/dev/iwlwifi/mld/tests/utils.c                                                           |   503 ++
 sys/contrib/dev/iwlwifi/mld/tests/utils.h                                                           |   140 +
 sys/contrib/dev/iwlwifi/mld/thermal.c                                                               |   467 ++
 sys/contrib/dev/iwlwifi/mld/thermal.h                                                               |    36 +
 sys/contrib/dev/iwlwifi/mld/time_sync.c                                                             |   240 +
 sys/contrib/dev/iwlwifi/mld/time_sync.h                                                             |    26 +
 sys/contrib/dev/iwlwifi/mld/tlc.c                                                                   |   702 +++
 sys/contrib/dev/iwlwifi/mld/tlc.h                                                                   |    23 +
 sys/contrib/dev/iwlwifi/mld/tx.c                                                                    |  1394 +++++
 sys/contrib/dev/iwlwifi/mld/tx.h                                                                    |    77 +
 sys/contrib/dev/iwlwifi/mvm/binding.c                                                               |     7 +-
 sys/contrib/dev/iwlwifi/mvm/coex.c                                                                  |    88 +-
 sys/contrib/dev/iwlwifi/mvm/constants.h                                                             |     8 +-
 sys/contrib/dev/iwlwifi/mvm/d3.c                                                                    |   761 +--
 sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c                                                           |    66 +-
 sys/contrib/dev/iwlwifi/mvm/debugfs.c                                                               |   130 +-
 sys/contrib/dev/iwlwifi/mvm/ftm-initiator.c                                                         |   130 +-
 sys/contrib/dev/iwlwifi/mvm/ftm-responder.c                                                         |    90 +-
 sys/contrib/dev/iwlwifi/mvm/fw.c                                                                    |   308 +-
 sys/contrib/dev/iwlwifi/mvm/led.c                                                                   |     4 +-
 sys/contrib/dev/iwlwifi/mvm/link.c                                                                  |   106 +-
 sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c                                                              |   259 +-
 sys/contrib/dev/iwlwifi/mvm/mac80211.c                                                              |   483 +-
 sys/contrib/dev/iwlwifi/mvm/mld-key.c                                                               |    14 +-
 sys/contrib/dev/iwlwifi/mvm/mld-mac.c                                                               |    55 +-
 sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c                                                          |   233 +-
 sys/contrib/dev/iwlwifi/mvm/mld-sta.c                                                               |    81 +-
 sys/contrib/dev/iwlwifi/mvm/mvm.h                                                                   |   225 +-
 sys/contrib/dev/iwlwifi/mvm/nvm.c                                                                   |    52 +-
 sys/contrib/dev/iwlwifi/mvm/offloading.c                                                            |     2 +-
 sys/contrib/dev/iwlwifi/mvm/ops.c                                                                   |   394 +-
 sys/contrib/dev/iwlwifi/mvm/phy-ctxt.c                                                              |     8 +-
 sys/contrib/dev/iwlwifi/mvm/power.c                                                                 |    10 +-
 sys/contrib/dev/iwlwifi/mvm/ptp.c                                                                   |    14 +-
 sys/contrib/dev/iwlwifi/mvm/quota.c                                                                 |    43 +-
 sys/contrib/dev/iwlwifi/mvm/rs-fw.c                                                                 |    36 +-
 sys/contrib/dev/iwlwifi/mvm/rx.c                                                                    |    77 +-
 sys/contrib/dev/iwlwifi/mvm/rxmq.c                                                                  |   236 +-
 sys/contrib/dev/iwlwifi/mvm/scan.c                                                                  |   192 +-
 sys/contrib/dev/iwlwifi/mvm/sta.c                                                                   |   244 +-
 sys/contrib/dev/iwlwifi/mvm/sta.h                                                                   |    29 +-
 sys/contrib/dev/iwlwifi/mvm/tdls.c                                                                  |    20 +-
 sys/contrib/dev/iwlwifi/mvm/tests/hcmd.c                                                            |    38 +
 sys/contrib/dev/iwlwifi/mvm/time-event.c                                                            |    61 +-
 sys/contrib/dev/iwlwifi/mvm/time-event.h                                                            |     8 +-
 sys/contrib/dev/iwlwifi/mvm/tt.c                                                                    |    97 +-
 sys/contrib/dev/iwlwifi/mvm/tx.c                                                                    |   406 +-
 sys/contrib/dev/iwlwifi/mvm/utils.c                                                                 |   258 +-
 sys/contrib/dev/iwlwifi/pcie/{ctxt-info-gen3.c => ctxt-info-v2.c}                                   |   213 +-
 sys/contrib/dev/iwlwifi/pcie/ctxt-info.c                                                            |    29 +-
 sys/contrib/dev/iwlwifi/pcie/drv.c                                                                  |  2503 ++++-----
 sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/internal.h                                                |   188 +-
 sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/rx.c                                                      |   223 +-
 sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/trans-gen2.c                                              |   209 +-
 sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/trans.c                                                   |  1216 ++--
 sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/tx-gen2.c                                                 |    88 +-
 sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/tx.c                                                      |   291 +-
 sys/contrib/dev/iwlwifi/{iwl-context-info-gen3.h => pcie/iwl-context-info-v2.h}                     |   109 +-
 sys/contrib/dev/iwlwifi/{ => pcie}/iwl-context-info.h                                               |    44 +-
 sys/contrib/dev/iwlwifi/pcie/utils.c                                                                |   128 +
 sys/contrib/dev/iwlwifi/pcie/utils.h                                                                |    40 +
 sys/contrib/dev/iwlwifi/tests/Makefile                                                              |     2 +-
 sys/contrib/dev/iwlwifi/tests/devinfo.c                                                             |   229 +-
 sys/contrib/dev/mediatek/mt76/channel.c                                                             |     9 +-
 sys/contrib/dev/mediatek/mt76/dma.c                                                                 |    14 +-
 sys/contrib/dev/mediatek/mt76/eeprom.c                                                              |     4 +
 sys/contrib/dev/mediatek/mt76/mac80211.c                                                            |    70 +-
 sys/contrib/dev/mediatek/mt76/mcu.c                                                                 |     4 +
 sys/contrib/dev/mediatek/mt76/mt76.h                                                                |    53 +-
 sys/contrib/dev/mediatek/mt76/mt7603/dma.c                                                          |     2 +-
 sys/contrib/dev/mediatek/mt76/mt7603/mac.c                                                          |    10 +-
 sys/contrib/dev/mediatek/mt76/mt7603/main.c                                                         |     5 +-
 sys/contrib/dev/mediatek/mt76/mt7615/init.c                                                         |     2 +-
 sys/contrib/dev/mediatek/mt76/mt7615/mac.c                                                          |     7 +-
 sys/contrib/dev/mediatek/mt76/mt7615/main.c                                                         |    17 +-
 sys/contrib/dev/mediatek/mt76/mt7615/mcu.c                                                          |     6 +-
 sys/contrib/dev/mediatek/mt76/mt7615/pci_mac.c                                                      |     4 +-
 sys/contrib/dev/mediatek/mt76/mt7615/sdio_mcu.c                                                     |   180 -
 sys/contrib/dev/mediatek/mt76/mt7615/usb.c                                                          |     2 +-
 sys/contrib/dev/mediatek/mt76/mt7615/usb_mcu.c                                                      |   100 -
 sys/contrib/dev/mediatek/mt76/mt76_connac.h                                                         |     7 +-
 sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.h                                                    |     4 +
 sys/contrib/dev/mediatek/mt76/mt76_connac_mac.c                                                     |     2 +-
 sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.c                                                     |    51 +-
 sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.h                                                     |    14 +
 sys/contrib/dev/mediatek/mt76/mt76x0/pci.c                                                          |     3 +-
 sys/contrib/dev/mediatek/mt76/mt76x02.h                                                             |     9 +-
 sys/contrib/dev/mediatek/mt76/mt76x02_mac.c                                                         |     4 +-
 sys/contrib/dev/mediatek/mt76/mt76x02_mmio.c                                                        |     1 -
 sys/contrib/dev/mediatek/mt76/mt76x02_usb_core.c                                                    |     4 +-
 sys/contrib/dev/mediatek/mt76/mt76x02_util.c                                                        |     4 +-
 sys/contrib/dev/mediatek/mt76/mt76x2/pci.c                                                          |     3 +-
 sys/contrib/dev/mediatek/mt76/mt76x2/pci_main.c                                                     |     6 +-
 sys/contrib/dev/mediatek/mt76/mt76x2/usb.c                                                          |     6 +-
 sys/contrib/dev/mediatek/mt76/mt76x2/usb_init.c                                                     |    13 +-
 sys/contrib/dev/mediatek/mt76/mt76x2/usb_main.c                                                     |     2 +-
 sys/contrib/dev/mediatek/mt76/mt7915/debugfs.c                                                      |    81 +-
 sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c                                                       |    33 +-
 sys/contrib/dev/mediatek/mt76/mt7915/eeprom.h                                                       |     1 +
 sys/contrib/dev/mediatek/mt76/mt7915/init.c                                                         |    16 +-
 sys/contrib/dev/mediatek/mt76/mt7915/mac.c                                                          |    84 +-
 sys/contrib/dev/mediatek/mt76/mt7915/main.c                                                         |    13 +-
 sys/contrib/dev/mediatek/mt76/mt7915/mcu.c                                                          |    86 +-
 sys/contrib/dev/mediatek/mt76/mt7915/mcu.h                                                          |    14 +-
 sys/contrib/dev/mediatek/mt76/mt7915/mmio.c                                                         |    11 +-
 sys/contrib/dev/mediatek/mt76/mt7915/mt7915.h                                                       |    25 +-
 sys/contrib/dev/mediatek/mt76/mt7921/mac.c                                                          |     8 +-
 sys/contrib/dev/mediatek/mt76/mt7921/main.c                                                         |    28 +-
 sys/contrib/dev/mediatek/mt76/mt7921/sdio.c                                                         |     2 +
 sys/contrib/dev/mediatek/mt76/mt7921/sdio_mac.c                                                     |    58 +
 sys/contrib/dev/mediatek/mt76/mt7925/Makefile                                                       |     1 +
 sys/contrib/dev/mediatek/mt76/mt7925/init.c                                                         |   104 +
 sys/contrib/dev/mediatek/mt76/mt7925/mac.c                                                          |     8 +-
 sys/contrib/dev/mediatek/mt76/mt7925/main.c                                                         |   219 +-
 sys/contrib/dev/mediatek/mt76/mt7925/mcu.c                                                          |   522 +-
 sys/contrib/dev/mediatek/mt76/mt7925/mcu.h                                                          |    93 +-
 sys/contrib/dev/mediatek/mt76/mt7925/mt7925.h                                                       |    42 +-
 sys/contrib/dev/mediatek/mt76/mt7925/pci.c                                                          |     7 +-
 sys/contrib/dev/mediatek/mt76/mt7925/regs.h                                                         |     4 +-
 sys/contrib/dev/mediatek/mt76/mt7925/testmode.c                                                     |   201 +
 sys/contrib/dev/mediatek/mt76/mt792x.h                                                              |    22 +-
 sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.c                                                     |   123 +-
 sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.h                                                     |    18 +-
 sys/contrib/dev/mediatek/mt76/mt792x_core.c                                                         |    45 +-
 sys/contrib/dev/mediatek/mt76/mt792x_mac.c                                                          |     5 +-
 sys/contrib/dev/mediatek/mt76/mt7996/coredump.c                                                     |     4 +-
 sys/contrib/dev/mediatek/mt76/mt7996/debugfs.c                                                      |    73 +-
 sys/contrib/dev/mediatek/mt76/mt7996/dma.c                                                          |   196 +-
 sys/contrib/dev/mediatek/mt76/mt7996/eeprom.c                                                       |    42 +-
 sys/contrib/dev/mediatek/mt76/mt7996/init.c                                                         |    45 +-
 sys/contrib/dev/mediatek/mt76/mt7996/mac.c                                                          |   492 +-
 sys/contrib/dev/mediatek/mt76/mt7996/main.c                                                         |  1028 +++-
 sys/contrib/dev/mediatek/mt76/mt7996/mcu.c                                                          |   907 +--
 sys/contrib/dev/mediatek/mt76/mt7996/mcu.h                                                          |    59 +-
 sys/contrib/dev/mediatek/mt76/mt7996/mmio.c                                                         |   200 +-
 sys/contrib/dev/mediatek/mt76/mt7996/mt7996.h                                                       |   156 +-
 sys/contrib/dev/mediatek/mt76/mt7996/pci.c                                                          |    26 +-
 sys/contrib/dev/mediatek/mt76/mt7996/regs.h                                                         |    51 +-
 sys/contrib/dev/mediatek/mt76/scan.c                                                                |    21 +-
 sys/contrib/dev/mediatek/mt76/sdio_txrx.c                                                           |     6 +-
 sys/contrib/dev/mediatek/mt76/tx.c                                                                  |    26 +-
 sys/contrib/dev/mediatek/mt76/util.c                                                                |     2 +-
 sys/contrib/dev/mediatek/mt76/wed.c                                                                 |     6 +-
 sys/contrib/dev/qat/qat_402xx.bin                                                                   |   Bin 0 -> 665360 bytes
 sys/contrib/dev/qat/qat_402xx_mmp.bin                                                               |   Bin 0 -> 150084 bytes
 sys/contrib/dev/rtw88/Makefile                                                                      |     9 +
 sys/contrib/dev/rtw88/coex.c                                                                        |    24 +-
 sys/contrib/dev/rtw88/debug.c                                                                       |    57 +-
 sys/contrib/dev/rtw88/fw.c                                                                          |    31 +-
 sys/contrib/dev/rtw88/fw.h                                                                          |     1 +
 sys/contrib/dev/rtw88/hci.h                                                                         |     8 +
 sys/contrib/dev/rtw88/mac.c                                                                         |    50 +-
 sys/contrib/dev/rtw88/mac.h                                                                         |     3 +
 sys/contrib/dev/rtw88/mac80211.c                                                                    |    11 +-
 sys/contrib/dev/rtw88/main.c                                                                        |   118 +-
 sys/contrib/dev/rtw88/main.h                                                                        |    65 +-
 sys/contrib/dev/rtw88/pci.c                                                                         |    55 +-
 sys/contrib/dev/rtw88/pci.h                                                                         |     1 +
 sys/contrib/dev/rtw88/phy.c                                                                         |   215 +-
 sys/contrib/dev/rtw88/phy.h                                                                         |    20 +-
 sys/contrib/dev/rtw88/reg.h                                                                         |    69 +-
 sys/contrib/dev/rtw88/rtw8703b.c                                                                    |    64 +-
 sys/contrib/dev/rtw88/rtw8723cs.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8723d.c                                                                    |     8 +-
 sys/contrib/dev/rtw88/rtw8723de.c                                                                   |     3 +-
 sys/contrib/dev/rtw88/rtw8723ds.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8723du.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8723x.c                                                                    |    68 +-
 sys/contrib/dev/rtw88/rtw8723x.h                                                                    |     6 +
 sys/contrib/dev/rtw88/rtw8812a.c                                                                    |     5 +-
 sys/contrib/dev/rtw88/rtw8812au.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8814a.c                                                                    |  2281 ++++++++
 sys/contrib/dev/rtw88/rtw8814a.h                                                                    |    62 +
 sys/contrib/dev/rtw88/rtw8814a_table.c                                                              | 23930 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sys/contrib/dev/rtw88/rtw8814a_table.h                                                              |    40 +
 sys/contrib/dev/rtw88/rtw8814ae.c                                                                   |    34 +
 sys/contrib/dev/rtw88/rtw8814au.c                                                                   |    54 +
 sys/contrib/dev/rtw88/rtw8821a.c                                                                    |     5 +-
 sys/contrib/dev/rtw88/rtw8821au.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8821c.c                                                                    |    21 +-
 sys/contrib/dev/rtw88/rtw8821ce.c                                                                   |     3 +-
 sys/contrib/dev/rtw88/rtw8821cs.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8821cu.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8822b.c                                                                    |    22 +-
 sys/contrib/dev/rtw88/rtw8822be.c                                                                   |     3 +-
 sys/contrib/dev/rtw88/rtw8822bs.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8822bu.c                                                                   |     8 +-
 sys/contrib/dev/rtw88/rtw8822c.c                                                                    |    11 +-
 sys/contrib/dev/rtw88/rtw8822ce.c                                                                   |     3 +-
 sys/contrib/dev/rtw88/rtw8822cs.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw8822cu.c                                                                   |     2 +-
 sys/contrib/dev/rtw88/rtw88xxa.c                                                                    |     2 +-
 sys/contrib/dev/rtw88/rx.c                                                                          |     6 +
 sys/contrib/dev/rtw88/sar.c                                                                         |     2 +-
 sys/contrib/dev/rtw88/sdio.c                                                                        |    37 +-
 sys/contrib/dev/rtw88/tx.c                                                                          |     3 +-
 sys/contrib/dev/rtw88/usb.c                                                                         |    65 +-
 sys/contrib/dev/rtw88/util.c                                                                        |     3 +-
 sys/contrib/dev/rtw89/Kconfig                                                                       |    28 +-
 sys/contrib/dev/rtw89/Makefile                                                                      |     9 +
 sys/contrib/dev/rtw89/acpi.c                                                                        |  1140 +++-
 sys/contrib/dev/rtw89/acpi.h                                                                        |   223 +-
 sys/contrib/dev/rtw89/cam.c                                                                         |    13 +
 sys/contrib/dev/rtw89/chan.c                                                                        |   993 +++-
 sys/contrib/dev/rtw89/chan.h                                                                        |    92 +-
 sys/contrib/dev/rtw89/coex.c                                                                        |  4128 ++++++++------
 sys/contrib/dev/rtw89/coex.h                                                                        |    25 +-
 sys/contrib/dev/rtw89/core.c                                                                        |  1019 +++-
 sys/contrib/dev/rtw89/core.h                                                                        |   572 +-
 sys/contrib/dev/rtw89/debug.c                                                                       |  2232 ++++----
 sys/contrib/dev/rtw89/fw.c                                                                          |  1464 ++++-
 sys/contrib/dev/rtw89/fw.h                                                                          |   305 +-
 sys/contrib/dev/rtw89/mac.c                                                                         |   316 +-
 sys/contrib/dev/rtw89/mac.h                                                                         |    63 +-
 sys/contrib/dev/rtw89/mac80211.c                                                                    |   420 +-
 sys/contrib/dev/rtw89/mac_be.c                                                                      |    12 +-
 sys/contrib/dev/rtw89/pci.c                                                                         |    78 +-
 sys/contrib/dev/rtw89/pci.h                                                                         |    57 +-
 sys/contrib/dev/rtw89/pci_be.c                                                                      |     2 +-
 sys/contrib/dev/rtw89/phy.c                                                                         |  1209 ++--
 sys/contrib/dev/rtw89/phy.h                                                                         |    40 +-
 sys/contrib/dev/rtw89/phy_be.c                                                                      |     2 +-
 sys/contrib/dev/rtw89/ps.c                                                                          |   207 +-
 sys/contrib/dev/rtw89/ps.h                                                                          |     6 +
 sys/contrib/dev/rtw89/reg.h                                                                         |    95 +-
 sys/contrib/dev/rtw89/regd.c                                                                        |   780 ++-
 sys/contrib/dev/rtw89/rtw8851b.c                                                                    |   199 +-
 sys/contrib/dev/rtw89/rtw8851b_rfk.c                                                                |   156 +-
 sys/contrib/dev/rtw89/rtw8851b_rfk_table.c                                                          |    77 +-
 sys/contrib/dev/rtw89/rtw8851b_rfk_table.h                                                          |     2 +-
 sys/contrib/dev/rtw89/rtw8851b_table.c                                                              |   501 +-
 sys/contrib/dev/rtw89/rtw8851be.c                                                                   |     1 +
 sys/contrib/dev/rtw89/rtw8851bu.c                                                                   |    39 +
 sys/contrib/dev/rtw89/rtw8852a.c                                                                    |    35 +-
 sys/contrib/dev/rtw89/rtw8852ae.c                                                                   |     1 +
 sys/contrib/dev/rtw89/rtw8852b.c                                                                    |   128 +-
 sys/contrib/dev/rtw89/rtw8852b_common.c                                                             |    46 +-
 sys/contrib/dev/rtw89/rtw8852b_rfk.c                                                                |    95 +-
 sys/contrib/dev/rtw89/rtw8852b_rfk.h                                                                |     3 +
 sys/contrib/dev/rtw89/rtw8852be.c                                                                   |     1 +
 sys/contrib/dev/rtw89/rtw8852bt.c                                                                   |    47 +-
 sys/contrib/dev/rtw89/rtw8852bt_rfk.c                                                               |    87 +-
 sys/contrib/dev/rtw89/rtw8852bt_rfk.h                                                               |     3 +
 sys/contrib/dev/rtw89/rtw8852bte.c                                                                  |     1 +
 sys/contrib/dev/rtw89/rtw8852bu.c                                                                   |    55 +
 sys/contrib/dev/rtw89/rtw8852c.c                                                                    |    65 +-
 sys/contrib/dev/rtw89/rtw8852ce.c                                                                   |     1 +
 sys/contrib/dev/rtw89/rtw8922a.c                                                                    |   157 +-
 sys/contrib/dev/rtw89/rtw8922a_rfk.c                                                                |    57 +-
 sys/contrib/dev/rtw89/rtw8922ae.c                                                                   |     1 +
 sys/contrib/dev/rtw89/sar.c                                                                         |   677 ++-
 sys/contrib/dev/rtw89/sar.h                                                                         |    27 +-
 sys/contrib/dev/rtw89/ser.c                                                                         |    34 +-
 sys/contrib/dev/rtw89/txrx.h                                                                        |    32 +
 sys/contrib/dev/rtw89/usb.c                                                                         |  1042 ++++
 sys/contrib/dev/rtw89/usb.h                                                                         |    65 +
 sys/contrib/dev/rtw89/util.c                                                                        |   220 +-
 sys/contrib/dev/rtw89/util.h                                                                        |    13 +-
 sys/contrib/dev/rtw89/wow.c                                                                         |    28 +-
 sys/contrib/dev/rtw89/wow.h                                                                         |    14 +-
 sys/contrib/libnv/bsd_nvpair.c                                                                      |     8 +-
 sys/contrib/openzfs/.github/ISSUE_TEMPLATE/feature_request.md                                       |     2 +-
 sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh                                       |    11 +-
 sys/contrib/openzfs/.github/workflows/zfs-qemu.yml                                                  |     2 +-
 sys/contrib/openzfs/META                                                                            |     2 +-
 sys/contrib/openzfs/cmd/zdb/zdb.c                                                                   |   191 +-
 sys/contrib/openzfs/cmd/zfs/zfs_main.c                                                              |    10 +-
 sys/contrib/openzfs/cmd/zinject/zinject.c                                                           |    81 +-
 sys/contrib/openzfs/cmd/zpool/zpool_iter.c                                                          |    19 +-
 sys/contrib/openzfs/cmd/zpool/zpool_main.c                                                          |     1 +
 sys/contrib/openzfs/cmd/zpool/zpool_vdev.c                                                          |    64 +-
 sys/contrib/openzfs/config/kernel-block-device-operations.m4                                        |    34 +
 sys/contrib/openzfs/config/kernel-drop-inode.m4                                                     |    24 +
 sys/contrib/openzfs/config/kernel-namespace.m4                                                      |    31 +
 sys/contrib/openzfs/config/kernel-userns-capabilities.m4                                            |    79 -
 sys/contrib/openzfs/config/kernel-writeback.m4                                                      |    58 +
 sys/contrib/openzfs/config/kernel-writepage_t.m4                                                    |    26 -
 sys/contrib/openzfs/config/kernel.m4                                                                |     8 +-
 sys/contrib/openzfs/contrib/intel_qat/readme.md                                                     |     2 +-
 sys/contrib/openzfs/etc/init.d/README.md                                                            |     2 +-
 sys/contrib/openzfs/include/libzfs.h                                                                |     2 +
 sys/contrib/openzfs/include/os/linux/kernel/linux/vfs_compat.h                                      |     7 +
 sys/contrib/openzfs/include/sys/spa.h                                                               |     2 +-
 sys/contrib/openzfs/include/sys/zfs_ioctl.h                                                         |     1 +
 sys/contrib/openzfs/include/sys/zio.h                                                               |     1 +
 sys/contrib/openzfs/lib/libspl/include/sys/uio.h                                                    |     1 +
 sys/contrib/openzfs/lib/libuutil/libuutil.abi                                                       |   105 +-
 sys/contrib/openzfs/lib/libzfs/libzfs.abi                                                           |   172 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_config.c                                                      |    17 +
 sys/contrib/openzfs/lib/libzfs/libzfs_status.c                                                      |    78 +-
 sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi                                                 |   105 +-
 sys/contrib/openzfs/lib/libzpool/kernel.c                                                           |    79 +-
 sys/contrib/openzfs/man/man8/zdb.8                                                                  |    14 +
 sys/contrib/openzfs/man/man8/zinject.8                                                              |    14 +
 sys/contrib/openzfs/man/man8/zpool-remove.8                                                         |     4 +-
 sys/contrib/openzfs/module/icp/algs/sha2/sha2_generic.c                                             |    41 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c                                               |    41 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c                                              |     3 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c                                            |    31 +-
 sys/contrib/openzfs/module/os/linux/spl/spl-zone.c                                                  |    19 +-
 sys/contrib/openzfs/module/os/linux/zfs/abd_os.c                                                    |     9 +
 sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c                                                   |     2 +-
 sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops_os.c                                              |     5 +-
 sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c                                                  |    74 +
 sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c                                                 |     4 +-
 sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c                                                   |   109 +-
 sys/contrib/openzfs/module/zcommon/zfs_prop.c                                                       |     2 +-
 sys/contrib/openzfs/module/zfs/arc.c                                                                |    17 +-
 sys/contrib/openzfs/module/zfs/mmp.c                                                                |     2 +-
 sys/contrib/openzfs/module/zfs/spa_misc.c                                                           |     8 +-
 sys/contrib/openzfs/module/zfs/vdev_raidz.c                                                         |     2 +-
 sys/contrib/openzfs/module/zfs/vdev_removal.c                                                       |    80 +-
 sys/contrib/openzfs/module/zfs/zio.c                                                                |    35 +-
 sys/contrib/openzfs/module/zfs/zio_inject.c                                                         |    38 +
 sys/contrib/openzfs/module/zfs/zvol.c                                                               |     2 +-
 sys/contrib/openzfs/tests/runfiles/common.run                                                       |     3 +-
 sys/contrib/openzfs/tests/runfiles/sanity.run                                                       |     2 +-
 sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek.c                                                 |    35 +-
 sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am                                               |     1 +
 sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen_004_pos.ksh |     2 +
 sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib                |     6 +-
 sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh                        |    53 +
 sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh              |     7 +
 sys/crypto/openssl/amd64/ossl_aes_gcm_avx512.c                                                      |   232 +
 sys/crypto/openssl/arm/{ossl_aes_gcm.c => ossl_aes_gcm_neon.c}                                      |     0
 sys/crypto/openssl/{amd64 => }/ossl_aes_gcm.c                                                       |   397 +-
 sys/crypto/openssl/ossl_ppc.c                                                                       |     9 +-
 sys/crypto/openssl/ossl_x86.c                                                                       |     6 +-
 sys/dev/ahci/ahci_pci.c                                                                             |    47 +-
 sys/dev/dc/if_dc.c                                                                                  |     2 +-
 sys/dev/e1000/e1000_osdep.h                                                                         |    46 +-
 sys/dev/e1000/if_em.c                                                                               |    83 +-
 sys/dev/ice/ice_common.c                                                                            |     9 +
 sys/dev/ice/ice_devids.h                                                                            |    18 +
 sys/dev/ice/ice_drv_info.h                                                                          |    42 +
 sys/dev/ichsmb/ichsmb_pci.c                                                                         |     3 +
 sys/dev/ixl/if_ixl.c                                                                                |    27 +-
 sys/dev/ixl/ixl.h                                                                                   |     1 +
 sys/dev/ixl/ixl_pf_main.c                                                                           |   110 +-
 sys/dev/le/lance.c                                                                                  |     2 +-
 sys/dev/md/md.c                                                                                     |     8 +-
 sys/dev/netmap/netmap_freebsd.c                                                                     |     1 +
 sys/dev/nvme/nvme_private.h                                                                         |     6 +-
 sys/dev/pci/pci.c                                                                                   |    10 +
 sys/dev/qat/include/common/adf_accel_devices.h                                                      |     4 +
 sys/dev/qat/qat_api/include/icp_sal_versions.h                                                      |     2 +-
 sys/dev/qat/qat_common/qat_uclo.c                                                                   |     1 +
 sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c                                                      |    58 +-
 sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.h                                                      |     6 +
 sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c                                                               |    15 +-
 sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c                                                             |    15 +-
 sys/dev/random/fenestrasX/fx_pool.c                                                                 |     6 +-
 sys/dev/random/ivy.c                                                                                |    69 +-
 sys/dev/random/random_harvestq.c                                                                    |     4 +-
 sys/dev/random/rdseed.c                                                                             |   169 +
 sys/dev/sound/dummy.c                                                                               |    11 +-
 sys/dev/sound/pci/hda/hdac.c                                                                        |     1 +
 sys/dev/sound/pci/hda/hdac.h                                                                        |     1 +
 sys/dev/sound/pcm/dsp.c                                                                             |    18 +-
 sys/dev/usb/controller/xhci_pci.c                                                                   |     2 +
 sys/dev/vmm/vmm_mem.c                                                                               |    31 +-
 sys/dev/vmm/vmm_mem.h                                                                               |     6 +-
 sys/fs/deadfs/dead_vnops.c                                                                          |    10 +-
 sys/fs/nfs/nfs_commonsubs.c                                                                         |    13 +-
 sys/fs/nfsclient/nfs_clrpcops.c                                                                     |    34 +-
 sys/fs/nfsserver/nfs_nfsdserv.c                                                                     |     5 +
 sys/fs/nullfs/null.h                                                                                |    13 +-
 sys/fs/nullfs/null_subr.c                                                                           |     4 +-
 sys/fs/nullfs/null_vfsops.c                                                                         |    20 +-
 sys/fs/nullfs/null_vnops.c                                                                          |    10 +-
 sys/geom/zero/g_zero.c                                                                              |     4 +-
 sys/i386/conf/NOTES                                                                                 |     7 +
 sys/isa/isa_common.c                                                                                |     2 +-
 sys/kern/imgact_elf.c                                                                               |     8 +-
 sys/kern/kern_conf.c                                                                                |     2 +-
 sys/kern/kern_event.c                                                                               |     2 +-
 sys/kern/kern_exec.c                                                                                |     2 +-
 sys/kern/kern_exit.c                                                                                |    46 +-
 sys/kern/kern_jail.c                                                                                |    23 +-
 sys/kern/kern_lock.c                                                                                |     6 +-
 sys/kern/kern_sx.c                                                                                  |    11 +-
 sys/kern/link_elf.c                                                                                 |     6 +
 sys/kern/link_elf_obj.c                                                                             |     8 +-
 sys/kern/subr_kdb.c                                                                                 |     2 +-
 sys/kern/sys_procdesc.c                                                                             |     2 +-
 sys/kern/uipc_usrreq.c                                                                              |    20 +-
 sys/kern/vfs_syscalls.c                                                                             |     2 +-
 sys/kern/vfs_vnops.c                                                                                |    18 +-
 sys/libkern/arm64/crc32c_armv8.S                                                                    |     8 +-
 sys/modules/Makefile                                                                                |    23 +-
 sys/modules/allwinner/aw_sid/Makefile                                                               |     3 +-
 sys/modules/allwinner/aw_thermal/Makefile                                                           |     3 +-
 sys/modules/dtb/allwinner/Makefile                                                                  |     7 +-
 sys/modules/dtb/starfive/Makefile                                                                   |     7 +
 sys/modules/dummynet/Makefile                                                                       |     3 +-
 sys/modules/iwlwifi/Makefile                                                                        |    68 +-
 sys/modules/mt76/Makefile.inc                                                                       |     1 +
 sys/modules/ossl/Makefile                                                                           |     7 +-
 sys/modules/qatfw/qat_4xxx/Makefile                                                                 |     5 +-
 sys/modules/rdrand_rng/Makefile                                                                     |     5 -
 sys/modules/rdseed_rng/Makefile                                                                     |     9 +
 sys/modules/rtw88/Makefile                                                                          |     5 +-
 sys/modules/rtw89/Makefile                                                                          |     8 +-
 sys/modules/zfs/zfs_config.h                                                                        |    17 +-
 sys/modules/zfs/zfs_gitrev.h                                                                        |     2 +-
 sys/net/altq/altq_cbq.c                                                                             |     2 +
 sys/net/altq/altq_fairq.c                                                                           |     2 +
 sys/net/altq/altq_priq.c                                                                            |     2 +
 sys/net/if.c                                                                                        |    34 +-
 sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c                                                     |     3 -
 sys/netinet/in_pcb.c                                                                                |    13 +-
 sys/netinet/in_proto.c                                                                              |     2 +
 sys/netinet/ip_carp.c                                                                               |    27 +-
 sys/netinet/raw_ip.c                                                                                |     4 -
 sys/netinet/tcp_input.c                                                                             |     2 +-
 sys/netinet/tcp_lro.c                                                                               |     9 +-
 sys/netinet/tcp_output.c                                                                            |     2 +-
 sys/netinet/tcp_stacks/rack.c                                                                       |   201 +-
 sys/netinet/tcp_stacks/tcp_rack.h                                                                   |     1 -
 sys/netinet/tcp_subr.c                                                                              |     2 +-
 sys/netinet/tcp_syncache.c                                                                          |    58 +-
 sys/netinet/tcp_timer.c                                                                             |     7 +-
 sys/netinet/udp_usrreq.c                                                                            |    49 +-
 sys/netinet/udp_var.h                                                                               |     1 +
 sys/netinet6/in6.c                                                                                  |    14 +-
 sys/netinet6/in6_src.c                                                                              |    54 +-
 sys/netinet6/ip6_var.h                                                                              |     2 +
 sys/netinet6/nd6.h                                                                                  |     4 +
 sys/netinet6/nd6_nbr.c                                                                              |   121 +-
 sys/netlink/netlink_snl.h                                                                           |     6 +-
 sys/netpfil/ipfilter/netinet/ip_htable.c                                                            |     2 +
 sys/netpfil/ipfilter/netinet/ip_nat.c                                                               |     1 +
 sys/netpfil/ipfw/ip_dn_glue.c                                                                       |   858 ---
 sys/netpfil/ipfw/ip_dn_private.h                                                                    |    10 +-
 sys/netpfil/ipfw/ip_dummynet.c                                                                      |    96 +-
 sys/netpfil/ipfw/ip_fw_nat.c                                                                        |    12 +-
 sys/netpfil/pf/pf.c                                                                                 |     1 +
 sys/netpfil/pf/pf_lb.c                                                                              |     1 +
 sys/riscv/conf/std.allwinner                                                                        |     3 +
 sys/riscv/conf/std.starfive                                                                         |     3 +
 sys/riscv/include/vmm.h                                                                             |    24 +-
 sys/riscv/vmm/riscv.h                                                                               |    23 -
 sys/riscv/vmm/vmm.c                                                                                 |    35 +-
 sys/rpc/auth.h                                                                                      |     4 +
 sys/rpc/authunix_prot.c                                                                             |    93 +-
 sys/rpc/svc_auth_unix.c                                                                             |    94 +-
 sys/sys/param.h                                                                                     |     2 +-
 sys/sys/random.h                                                                                    |     4 +-
 sys/sys/sockbuf.h                                                                                   |     2 +-
 sys/sys/sockopt.h                                                                                   |     6 +-
 sys/sys/user.h                                                                                      |     3 +-
 sys/tools/gdb/README.txt                                                                            |    21 +
 {libexec/kgdb => sys/tools/gdb}/acttrace.py                                                         |    41 +-
 sys/tools/gdb/freebsd.py                                                                            |    75 +
 sys/tools/gdb/pcpu.py                                                                               |    77 +
 sys/tools/gdb/selftest.py                                                                           |    31 +
 sys/tools/gdb/selftest.sh                                                                           |    23 +
 sys/tools/gdb/vnet.py                                                                               |   100 +
 sys/tools/kernel-gdb.py                                                                             |    15 +
 sys/ufs/ffs/ffs_inode.c                                                                             |     4 +-
 sys/ufs/ufs/ufs_vnops.c                                                                             |     8 +-
 sys/vm/vm_domainset.c                                                                               |    10 +-
 sys/vm/vm_fault.c                                                                                   |   167 +-
 sys/vm/vm_glue.c                                                                                    |    24 +-
 sys/vm/vm_object.c                                                                                  |    12 +-
 sys/x86/conf/NOTES                                                                                  |     1 -
 sys/x86/include/mca.h                                                                               |    25 +
 sys/x86/x86/local_apic.c                                                                            |     9 +-
 sys/x86/x86/mca.c                                                                                   |   355 +-
 targets/pseudo/userland/Makefile.depend                                                             |     6 +
 targets/pseudo/userland/lib/Makefile.depend                                                         |     4 +
 targets/pseudo/userland/libexec/Makefile.depend                                                     |     4 +-
 tests/sys/fs/tarfs/tarfs_test.sh                                                                    |     6 +-
 tests/sys/kern/unix_stream.c                                                                        |    27 +
 tests/sys/mac/ipacl/Makefile                                                                        |     5 +
 tests/sys/mac/ipacl/ipacl_test.sh                                                                   |    16 +-
 tests/sys/mac/ipacl/utils.subr                                                                      |     4 -
 tests/sys/mac/portacl/Makefile                                                                      |     1 +
 tests/sys/mac/portacl/misc.sh                                                                       |    12 +-
 tests/sys/mac/portacl/nobody_test.sh                                                                |     1 +
 tests/sys/mac/portacl/root_test.sh                                                                  |     1 +
 tests/sys/netinet/so_reuseport_lb_test.c                                                            |   148 +
 tests/sys/netpfil/pf/anchor.sh                                                                      |    46 +
 tests/sys/netpfil/pf/rdr.sh                                                                         |    51 +
 tests/sys/sys/bitstring_test.c                                                                      |    14 +-
 tools/build/mk/OptionalObsoleteFiles.inc                                                            |    21 +-
 tools/build/options/WITHOUT_BLACKLIST                                                               |     6 +-
 tools/build/options/WITHOUT_BLACKLIST_SUPPORT                                                       |     8 +-
 tools/build/options/WITHOUT_BLOCKLIST                                                               |     4 +
 tools/build/options/WITHOUT_BLOCKLIST_SUPPORT                                                       |     6 +
 tools/tools/crypto/cryptocheck.c                                                                    |     9 +-
 tools/tools/git/mfc-candidates.lua                                                                  |     8 +-
 tools/tools/nanobsd/rescue/Files/root/ZFS_Create.txt                                                |     8 +-
 tools/tools/netrate/tcpp/README                                                                     |     2 +-
 tools/tools/sysdoc/tunables.mdoc                                                                    |     2 +-
 usr.bin/bsdcat/Makefile                                                                             |     2 +-
 usr.bin/cpio/Makefile                                                                               |     2 +-
 usr.bin/cpio/tests/Makefile                                                                         |     2 +-
 usr.bin/find/find.c                                                                                 |     2 +-
 usr.bin/id/id.1                                                                                     |    28 +-
 usr.bin/id/id.c                                                                                     |   154 +-
 usr.bin/login/login.conf                                                                            |     4 -
 usr.bin/mandoc/mandoc.ucl                                                                           |    20 +-
 usr.bin/mkimg/mkimg.c                                                                               |    21 +-
 usr.bin/ncurses/Makefile                                                                            |     2 +-
 usr.bin/netstat/if.c                                                                                |     3 +-
 usr.bin/netstat/inet.c                                                                              |    37 +-
 usr.bin/netstat/main.c                                                                              |     4 +
 usr.bin/sockstat/main.c                                                                             |   214 +-
 usr.bin/sockstat/sockstat.1                                                                         |    13 +-
 usr.bin/sockstat/tests/Makefile                                                                     |     3 +-
 usr.bin/tail/tests/tail_test.sh                                                                     |     2 +
 usr.bin/tar/Makefile                                                                                |     2 +-
 usr.bin/tar/tests/Makefile                                                                          |     1 +
 usr.bin/unzip/Makefile                                                                              |     2 +-
 usr.bin/unzip/tests/Makefile                                                                        |     2 +-
 usr.bin/vmstat/vmstat.c                                                                             |     4 +-
 usr.bin/w/w.c                                                                                       |    33 +-
 usr.sbin/Makefile                                                                                   |     2 +
 usr.sbin/acpi/acpidump/acpi.c                                                                       |    13 +-
 usr.sbin/arp/arp.c                                                                                  |    32 +-
 usr.sbin/arp/arp.h                                                                                  |     9 +-
 usr.sbin/arp/arp_netlink.c                                                                          |    20 +-
 usr.sbin/blacklistctl/Makefile                                                                      |     7 +-
 usr.sbin/blacklistd/Makefile                                                                        |     9 +-
 usr.sbin/blacklistd/blacklistd.conf                                                                 |    10 +-
 usr.sbin/blocklistctl/Makefile                                                                      |    22 +
 usr.sbin/blocklistctl/Makefile.depend                                                               |    18 +
 usr.sbin/blocklistd/Makefile                                                                        |    23 +
 usr.sbin/blocklistd/Makefile.depend                                                                 |    18 +
 usr.sbin/blocklistd/blocklistd.conf                                                                 |    16 +
 usr.sbin/bluetooth/rtlbtfw/main.c                                                                   |     3 -
 usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf                                                             |    10 -
 usr.sbin/bsdinstall/Makefile                                                                        |     3 +-
 usr.sbin/bsdinstall/bsdinstall.8                                                                    |    23 +-
 usr.sbin/bsdinstall/scripts/auto                                                                    |     6 +-
 usr.sbin/bsdinstall/scripts/bootconfig                                                              |     2 +-
 usr.sbin/bsdinstall/scripts/jail                                                                    |     8 +-
 usr.sbin/bsdinstall/scripts/keymap                                                                  |     2 +-
 usr.sbin/bsdinstall/scripts/script                                                                  |     2 +-
 usr.sbin/bsdinstall/scripts/zfsboot                                                                 |     2 +-
 usr.sbin/bsnmpd/bsnmpd/Makefile                                                                     |   203 +-
 usr.sbin/certctl/certctl.8                                                                          |     6 +-
 usr.sbin/crashinfo/crashinfo.sh                                                                     |     3 -
 usr.sbin/fwget/pci/pci_network_mediatek                                                             |    36 +-
 usr.sbin/iovctl/iovctl.8                                                                            |     2 +-
 usr.sbin/moused/moused/moused.c                                                                     |     2 +-
 usr.sbin/nfsuserd/nfsuserd.c                                                                        |    16 +-
 usr.sbin/periodic/etc/security/520.pfdenied                                                         |     2 +-
 usr.sbin/pkg/Makefile                                                                               |     1 +
 usr.sbin/pmcstat/pmcpl_callgraph.c                                                                  |     2 +-
 usr.sbin/pmcstat/pmcstat.c                                                                          |     7 +-
 usr.sbin/pw/pwupd.c                                                                                 |     2 +-
 usr.sbin/quot/Makefile                                                                              |     8 +-
 usr.sbin/quot/quot.8                                                                                |     9 +-
 usr.sbin/quot/quot.c                                                                                |   339 +-
 usr.sbin/quot/tests/Makefile                                                                        |     4 +
 usr.sbin/quot/tests/quot_test.sh                                                                    |   102 +
 usr.sbin/rpc.tlsservd/rpc.tlsservd.c                                                                |     7 +
 usr.sbin/sndctl/sndctl.c                                                                            |     4 +
 usr.sbin/unbound/Makefile.inc                                                                       |     2 +-
 usr.sbin/unbound/setup/local-unbound-setup.sh                                                       |     1 +
 usr.sbin/virtual_oss/virtual_bt_speaker/bt_speaker.c                                                |     1 -
 usr.sbin/virtual_oss/virtual_oss/int.h                                                              |     3 -
 usr.sbin/virtual_oss/virtual_oss/main.c                                                             |     1 -
 usr.sbin/virtual_oss/virtual_oss/utils.h                                                            |    31 -
 1426 files changed, 128359 insertions(+), 50493 deletions(-)
 create mode 100644 contrib/blocklist/bin/blocklistctl.8
 create mode 100644 contrib/blocklist/bin/blocklistctl.c
 create mode 100644 contrib/blocklist/bin/blocklistd.8
 create mode 100644 contrib/blocklist/bin/blocklistd.c
 create mode 100644 contrib/blocklist/bin/blocklistd.conf.5
 create mode 100644 contrib/blocklist/bin/old_internal.c
 create mode 100644 contrib/blocklist/bin/old_internal.h
 create mode 100644 contrib/blocklist/diff/postfix.diff
 rename contrib/blocklist/etc/{blacklistd.conf => blocklistd.conf} (58%)
 create mode 100644 contrib/blocklist/etc/ipf.conf
 rename contrib/blocklist/etc/rc.d/{blacklistd => blocklistd} (71%)
 create mode 100644 contrib/blocklist/include/blocklist.h
 create mode 100644 contrib/blocklist/include/old_bl.h
 create mode 100644 contrib/blocklist/lib/blocklist.c
 create mode 100644 contrib/blocklist/lib/libblocklist.3
 create mode 100644 contrib/blocklist/lib/old_bl.c
 delete mode 100644 contrib/blocklist/libexec/blacklistd-helper
 create mode 100755 contrib/blocklist/libexec/blocklistd-helper
 create mode 100644 contrib/blocklist/port/vsyslog_r.c
 create mode 100644 contrib/libarchive/libarchive/archive_platform_stat.h
 create mode 100644 contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu
 create mode 100644 contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu
 create mode 100644 contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu
 create mode 100644 contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu
 create mode 100644 contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c
 create mode 100644 contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu
 rename contrib/libarchive/libarchive_fe/{err.c => lafe_err.c} (99%)
 rename contrib/libarchive/libarchive_fe/{err.h => lafe_err.h} (100%)
 create mode 100644 contrib/libarchive/tar/test/test_crlf_mtree.c
 create mode 100644 contrib/unbound/doc/README.man
 create mode 100644 contrib/unbound/doc/libunbound.rst
 create mode 100644 contrib/unbound/doc/unbound-anchor.rst
 create mode 100644 contrib/unbound/doc/unbound-checkconf.rst
 create mode 100644 contrib/unbound/doc/unbound-control.rst
 create mode 100644 contrib/unbound/doc/unbound-host.rst
 create mode 100644 contrib/unbound/doc/unbound.conf.rst
 create mode 100644 contrib/unbound/doc/unbound.rst
 delete mode 100644 contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.conf
 delete mode 100644 contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.test
 delete mode 100644 contrib/unbound/testdata/09-unbound-control.tdir/09-unbound-control.testns
 delete mode 100644 contrib/unbound/testdata/acl_interface.tdir/acl_interface.conf
 delete mode 100644 contrib/unbound/testdata/acl_interface.tdir/acl_interface.test.scenario
 delete mode 100644 contrib/unbound/testdata/auth_tls.tdir/auth_tls.pre
 delete mode 100644 contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.pre
 delete mode 100644 contrib/unbound/testdata/cachedb_expired.crpl
 delete mode 100644 contrib/unbound/testdata/cachedb_expired_reply_ttl.crpl
 delete mode 100644 contrib/unbound/testdata/cachedb_servfail_cname.crpl
 delete mode 100644 contrib/unbound/testdata/cachedb_val_expired.crpl
 delete mode 100644 contrib/unbound/testdata/common.sh
 delete mode 100644 contrib/unbound/testdata/dns_error_reporting.rpl
 delete mode 100644 contrib/unbound/testdata/dnstap.tdir/dnstap.conf
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/auth1.zone
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/auth2.zone
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.conf2
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.dsc
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns1
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.ns2
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.post
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.pre
 delete mode 100644 contrib/unbound/testdata/fast_reload_fwd.tdir/fast_reload_fwd.test
 delete mode 100644 contrib/unbound/testdata/fast_reload_most_options.tdir/auth.nlnetlabs.nl.zone
 delete mode 100644 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.conf
 delete mode 100644 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.dsc
 delete mode 100644 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.post
 delete mode 100644 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.pre
 delete mode 100644 contrib/unbound/testdata/fast_reload_most_options.tdir/fast_reload_most_options.test
 delete mode 100644 contrib/unbound/testdata/fast_reload_most_options.tdir/rpz.nlnetlabs.nl.zone
 delete mode 100644 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.conf
 delete mode 100644 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.dsc
 delete mode 100644 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.post
 delete mode 100644 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.pre
 delete mode 100644 contrib/unbound/testdata/fast_reload_thread.tdir/fast_reload_thread.test
 delete mode 100644 contrib/unbound/testdata/fwd_0ttlservfail.rpl
 delete mode 100644 contrib/unbound/testdata/iter_failreply.rpl
 delete mode 100644 contrib/unbound/testdata/iter_fwdstubauth.rpl
 delete mode 100644 contrib/unbound/testdata/iter_scrub_rr_length.rpl
 delete mode 100644 contrib/unbound/testdata/log_servfail.tdir/log_servfail.conf
 delete mode 100644 contrib/unbound/testdata/log_servfail.tdir/log_servfail.dsc
 delete mode 100644 contrib/unbound/testdata/log_servfail.tdir/log_servfail.post
 delete mode 100644 contrib/unbound/testdata/log_servfail.tdir/log_servfail.pre
 delete mode 100644 contrib/unbound/testdata/log_servfail.tdir/log_servfail.test
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/after.zone
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/before.zone
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/redis.conf
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/redis_replica.conf
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/redis_replica.dsc
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/redis_replica.post
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/redis_replica.pre
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/redis_replica.test
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/unbound_control.key
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/unbound_control.pem
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/unbound_server.key
 delete mode 100644 contrib/unbound/testdata/redis_replica.tdir/unbound_server.pem
 delete mode 100644 contrib/unbound/testdata/rpz_nsdname.rpl
 delete mode 100644 contrib/unbound/testdata/rpz_val_block.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_cached_servfail.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_client_timeout_servfail.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_client_timeout_val_bogus.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_reply_ttl.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_ttl.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_ttl_reset.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_val_bogus.rpl
 delete mode 100644 contrib/unbound/testdata/serve_expired_zerottl.rpl
 delete mode 100644 contrib/unbound/testdata/serve_original_ttl.rpl
 delete mode 100644 contrib/unbound/testdata/stat_values.tdir/stat_values.conf
 delete mode 100644 contrib/unbound/testdata/stat_values.tdir/stat_values.pre
 delete mode 100644 contrib/unbound/testdata/stat_values.tdir/stat_values.test
 delete mode 100644 contrib/unbound/testdata/stat_values.tdir/stat_values.testns
 delete mode 100644 contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf
 delete mode 100644 contrib/unbound/testdata/stat_values.tdir/stat_values_discard_wait_limit.conf
 delete mode 100644 contrib/unbound/testdata/subnet_cached_servfail.crpl
 delete mode 100644 contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl
 delete mode 100644 contrib/unbound/testdata/subnet_global_prefetch_expired.crpl
 delete mode 100644 contrib/unbound/testdata/test_ldnsrr.4
 delete mode 100644 contrib/unbound/testdata/test_ldnsrr.5
 delete mode 100644 contrib/unbound/testdata/test_ldnsrr.c3
 delete mode 100644 contrib/unbound/testdata/test_ldnsrr.c4
 delete mode 100644 contrib/unbound/testdata/test_ldnsrr.c5
 delete mode 100644 contrib/unbound/testdata/val_failure_dnskey.rpl
 delete mode 100644 contrib/unbound/testdata/val_scrub_rr_length.rpl
 rename crypto/openssh/{blacklist.c => blocklist.c} (89%)
 rename crypto/openssh/{blacklist_client.h => blocklist_client.h} (77%)
 create mode 100644 lib/libblocklist/Makefile
 create mode 100644 lib/libblocklist/Makefile.depend
 create mode 100644 lib/libbz2/bzip2.pc.in
 delete mode 100644 lib/libc/md/Makefile.inc
 create mode 100644 lib/libc/tests/net/inet_net_test.cc
 delete mode 100644 libexec/blacklistd-helper/Makefile
 create mode 100644 libexec/blocklistd-helper/Makefile
 rename libexec/{blacklistd-helper => blocklistd-helper}/Makefile.depend (100%)
 create mode 100644 libexec/blocklistd-helper/blacklistd-helper
 delete mode 100644 libexec/kgdb/Makefile
 create mode 100755 libexec/rc/rc.d/blocklistd
 create mode 100644 release/packages/ucl/dhclient.ucl
 create mode 100644 release/packages/ucl/flua-all.ucl
 rename release/packages/ucl/{unbound-all.ucl => local-unbound-all.ucl} (100%)
 create mode 100644 release/packages/ucl/local-unbound.ucl
 create mode 100644 release/packages/ucl/tests.ucl
 create mode 100644 release/packages/ucl/zlib-all.ucl
 rename share/man/man4/{man4.arm => }/aw_gpio.4 (99%)
 rename share/man/man4/{man4.arm => }/aw_mmc.4 (97%)
 rename share/man/man4/{man4.arm => }/aw_rtc.4 (99%)
 rename share/man/man4/{man4.arm => }/aw_sid.4 (99%)
 rename share/man/man4/{man4.arm => }/aw_spi.4 (99%)
 rename share/man/man4/{man4.arm => }/aw_syscon.4 (99%)
 create mode 100644 sys/compat/linuxkpi/common/include/linux/fips.h
 create mode 100644 sys/compat/linuxkpi/common/include/net/netmem.h
 delete mode 100644 sys/compat/linuxkpi/common/include/net/page_pool.h
 create mode 100644 sys/compat/linuxkpi/common/include/net/page_pool/helpers.h
 create mode 100644 sys/compat/linuxkpi/common/include/net/page_pool/types.h
 create mode 100644 sys/contrib/dev/iwlwifi/cfg/dr.c
 create mode 100644 sys/contrib/dev/iwlwifi/cfg/rf-fm.c
 create mode 100644 sys/contrib/dev/iwlwifi/cfg/rf-gf.c
 create mode 100644 sys/contrib/dev/iwlwifi/cfg/rf-hr.c
 create mode 100644 sys/contrib/dev/iwlwifi/cfg/rf-jf.c
 create mode 100644 sys/contrib/dev/iwlwifi/cfg/rf-pe.c
 create mode 100644 sys/contrib/dev/iwlwifi/cfg/rf-wh.c
 create mode 100644 sys/contrib/dev/iwlwifi/fw/api/dhc.h
 create mode 100644 sys/contrib/dev/iwlwifi/fw/dhc-utils.h
 create mode 100644 sys/contrib/dev/iwlwifi/iwl-utils.c
 create mode 100644 sys/contrib/dev/iwlwifi/iwl-utils.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/Makefile
 create mode 100644 sys/contrib/dev/iwlwifi/mld/agg.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/agg.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/ap.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/ap.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/coex.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/coex.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/constants.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/d3.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/d3.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/debugfs.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/debugfs.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/ftm-initiator.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/ftm-initiator.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/fw.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/hcmd.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/iface.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/iface.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/key.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/key.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/led.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/led.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/link.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/link.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/low_latency.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/low_latency.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mac80211.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mac80211.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mcc.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mcc.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mld.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mld.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mlo.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/mlo.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/notif.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/notif.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/phy.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/phy.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/power.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/power.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/ptp.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/ptp.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/regulatory.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/regulatory.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/roc.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/roc.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/rx.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/rx.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/scan.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/scan.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/session-protect.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/session-protect.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/sta.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/sta.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/stats.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/stats.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/Makefile
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/agg.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/hcmd.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/link-selection.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/link.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/module.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/rx.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/utils.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tests/utils.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/thermal.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/thermal.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/time_sync.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/time_sync.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tlc.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tlc.h
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tx.c
 create mode 100644 sys/contrib/dev/iwlwifi/mld/tx.h
 create mode 100644 sys/contrib/dev/iwlwifi/mvm/tests/hcmd.c
 rename sys/contrib/dev/iwlwifi/pcie/{ctxt-info-gen3.c => ctxt-info-v2.c} (72%)
 rename sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/internal.h (89%)
 rename sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/rx.c (92%)
 rename sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/trans-gen2.c (73%)
 rename sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/trans.c (78%)
 rename sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/tx-gen2.c (94%)
 rename sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/tx.c (90%)
 rename sys/contrib/dev/iwlwifi/{iwl-context-info-gen3.h => pcie/iwl-context-info-v2.h} (79%)
 rename sys/contrib/dev/iwlwifi/{ => pcie}/iwl-context-info.h (89%)
 create mode 100644 sys/contrib/dev/iwlwifi/pcie/utils.c
 create mode 100644 sys/contrib/dev/iwlwifi/pcie/utils.h
 delete mode 100644 sys/contrib/dev/mediatek/mt76/mt7615/sdio_mcu.c
 delete mode 100644 sys/contrib/dev/mediatek/mt76/mt7615/usb_mcu.c
 create mode 100644 sys/contrib/dev/mediatek/mt76/mt7925/testmode.c
 create mode 100644 sys/contrib/dev/qat/qat_402xx.bin
 create mode 100644 sys/contrib/dev/qat/qat_402xx_mmp.bin
 create mode 100644 sys/contrib/dev/rtw88/rtw8814a.c
 create mode 100644 sys/contrib/dev/rtw88/rtw8814a.h
 create mode 100644 sys/contrib/dev/rtw88/rtw8814a_table.c
 create mode 100644 sys/contrib/dev/rtw88/rtw8814a_table.h
 create mode 100644 sys/contrib/dev/rtw88/rtw8814ae.c
 create mode 100644 sys/contrib/dev/rtw88/rtw8814au.c
 create mode 100644 sys/contrib/dev/rtw89/rtw8851bu.c
 create mode 100644 sys/contrib/dev/rtw89/rtw8852bu.c
 create mode 100644 sys/contrib/dev/rtw89/usb.c
 create mode 100644 sys/contrib/dev/rtw89/usb.h
 create mode 100644 sys/contrib/openzfs/config/kernel-drop-inode.m4
 create mode 100644 sys/contrib/openzfs/config/kernel-namespace.m4
 delete mode 100644 sys/contrib/openzfs/config/kernel-userns-capabilities.m4
 create mode 100644 sys/contrib/openzfs/config/kernel-writeback.m4
 delete mode 100644 sys/contrib/openzfs/config/kernel-writepage_t.m4
 create mode 100755 sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh
 create mode 100644 sys/crypto/openssl/amd64/ossl_aes_gcm_avx512.c
 rename sys/crypto/openssl/arm/{ossl_aes_gcm.c => ossl_aes_gcm_neon.c} (100%)
 rename sys/crypto/openssl/{amd64 => }/ossl_aes_gcm.c (52%)
 create mode 100644 sys/dev/random/rdseed.c
 create mode 100644 sys/modules/dtb/starfive/Makefile
 create mode 100644 sys/modules/rdseed_rng/Makefile
 delete mode 100644 sys/netpfil/ipfw/ip_dn_glue.c
 create mode 100644 sys/tools/gdb/README.txt
 rename {libexec/kgdb => sys/tools/gdb}/acttrace.py (62%)
 create mode 100644 sys/tools/gdb/freebsd.py
 create mode 100644 sys/tools/gdb/pcpu.py
 create mode 100644 sys/tools/gdb/selftest.py
 create mode 100644 sys/tools/gdb/selftest.sh
 create mode 100644 sys/tools/gdb/vnet.py
 create mode 100644 sys/tools/kernel-gdb.py
 create mode 100644 tools/build/options/WITHOUT_BLOCKLIST
 create mode 100644 tools/build/options/WITHOUT_BLOCKLIST_SUPPORT
 create mode 100644 usr.sbin/blocklistctl/Makefile
 create mode 100644 usr.sbin/blocklistctl/Makefile.depend
 create mode 100644 usr.sbin/blocklistd/Makefile
 create mode 100644 usr.sbin/blocklistd/Makefile.depend
 create mode 100644 usr.sbin/blocklistd/blocklistd.conf
 create mode 100644 usr.sbin/quot/tests/Makefile
 create mode 100644 usr.sbin/quot/tests/quot_test.sh
 delete mode 100644 usr.sbin/virtual_oss/virtual_oss/utils.h
root@ichigo:/usr/src # 

Quite a bit has changed since the last update I made on the system, and being Oct 31st, thats most of a month already.

tigersharke@ichigo:~ % cd /boot
tigersharke@ichigo:/boot % ls -l | grep kernel
drwxr-xr-x   2 root        wheel          861 Oct  5 21:42 kernel
drwxr-xr-x   2 root        wheel          861 Oct  5 05:37 kernel.old
tigersharke@ichigo:/boot % uname -a
FreeBSD ichigo 15.0-ALPHA5 FreeBSD 15.0-ALPHA5 stable/15-3e79ec993dc7 ICHIGO amd64
tigersharke@ichigo:/boot %

So one long command to do the job and probably up to an hour and a half until all of it finishes.

make -j `sysctl -n hw.ncpu` buildworld && make -j `sysctl -n hw.ncpu` kernel KERNCONFDIR=/root/kernconf KERNCONF=ICHIGO

The next part is to reboot to singleuser with the new kernel and install world and make any needed adjustments with etcupdate, although there should be fewer than when switching from stable-14 to stable-15.

mount -u /
zfs mount -a
cd /usr/src

From man 8 etcupdate

     -n             Enable “dry-run” mode.   Do not merge any changes to the
                    destination directory.   Instead, report what actions would
                    be taken during a merge.   Note that the existing “current”
                    and “previous” trees will not be changed.   If the -r
                    option is not specified, then a temporary “current” tree
                    will be extracted to perform the comparison.


     -p             Enable “pre-world” mode.   Only merge changes to files that
                    are necessary to successfully run ‘make installworld’ or
                    ‘make installkernel’.   When this flag is enabled, the
                    existing “current” and “previous” trees are left alone.
                    Instead, a temporary tree is populated with the necessary
                    files.   This temporary tree is compared against the
                    “current” tree.   This allows a normal update to be run
                    after ‘make installworld’ has completed.   Any conflicts
                    generated during a “pre-world” update should be resolved
                    by a “pre-world” resolve.
etcupdate -p
make -j `sysctl -n hw.ncpu` installworld
etcupdate -n

It looks like a few things changed somewhat.  With regard to conf files, such an update would require that any changes be reconciled, either an edit to have a combination or to choose to keep yours or replace it entirely with the new one.  This would mean it is advantageous to have your own unique local config files which either the system automatically draws in, such as rc.conf.local or could be sourced from within the file like the kernconf or ~/.fvwm/local.config.  No matter how it is done, it helps to have a clear demarcation between the original and your changes or additions, for any configuration file, plus comments if possible to explain how or what or why, or where the hint was discovered.

  U /etc/blacklistd.conf
  U /etc/defaults/rc.conf
  U /etc/devd/rtlbtfw.conf
  U /etc/devd/snd.conf
  U /etc/login.conf
  U /etc/mtree/BSD.include.dist
  U /etc/mtree/BSD.root.dist
  U /etc/mtree/BSD.tests.dist
  U /etc/mtree/BSD.usr.dist
  U /etc/mtree/BSD.var.dist
  U /etc/periodic/security/520.pfdenied
  U /etc/rc.d/blacklistd
  U /etc/rc.d/dmesg
  U /etc/rc.d/hostapd
  U /etc/rc.d/netwait
  U /etc/rc.d/virtual_oss
  U /etc/rc.d/zpoolreguid
  U /etc/rc.d/zpoolupgrade
  U /etc/rc.subr
  U /etc/ssh/sshd_config
  A /etc/blocklistd.conf
  A /etc/rc.d/blocklistd
etcupdate
yes|delete-old
yes|make delete-old-libs
reboot

A few moments of suspense while I recall that I had intended to rm /usr/obj prior to buildworld, which I forgot until I was listing these last steps above.  Everything built fine, no troubles at all, so maybe there was something else involved that other time, I cannot know.  Because everything built and installed perfectly, every step above completed without trouble, the last bit is to see if I will still have a good GUI.

The reboot is speedy but still a bit of anticipation before I see the font sizes in console, they toggle between two rather small sizes and land upon a rather small but readable size for my login prompt.  I am now fairly certain that my GUI will be fine, it will be the proper resolution.  A quick startx proves that everything is as I hoped and expected, nothing with the GUI seems to have broken with this update.  Maybe I can expect that the next time it breaks will be when I switch from stable-15 to stable-16.

tigersharke@ichigo:~ % cd /boot
tigersharke@ichigo:/boot % ls -l | grep kernel
drwxr-xr-x   2 root        wheel          861 Oct 31 18:40 kernel
drwxr-xr-x   2 root        wheel          861 Oct  5 21:42 kernel.old
tigersharke@ichigo:/boot % uname -a
FreeBSD ichigo 15.0-STABLE FreeBSD 15.0-STABLE stable/15-9d84e9cba12d ICHIGO amd64
tigersharke@ichigo:/boot % 

Now with regard to xlibre, I just wait until the next significant release and update to xlibre-ports, or maybe it won't be long before it is part of the ports tree, the future knows.

Frequently viewed this week