From noreply at github.com  Tue May  9 15:15:37 2023
From: noreply at github.com (Ed Maste)
Date: Tue, 09 May 2023 12:15:37 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src] 05ad74: Merge fix for zfs
 readmmap test from CheriBSD
Message-ID: <MidnightBSD/src/push/refs/heads/12.4/000000-d6d5ab@github.com>

  Branch: refs/heads/12.4
  Home:   https://github.com/MidnightBSD/src
  Commit: 05ad74fec563ac008cb1acf94aad791949565aae
      https://github.com/MidnightBSD/src/commit/05ad74fec563ac008cb1acf94aad791949565aae
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M tests/sys/cddl/zfs/bin/readmmap.c

  Log Message:
  -----------
  Merge fix for zfs readmmap test from CheriBSD

Merge commit 1737d8397a0 by Brooks Davis:

  time() is declared in time.h

This fixes a -Werror warning from clang 15:

  tests/sys/cddl/zfs/bin/readmmap.c:97:9: error: call to undeclared function 'time'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]

Obtained from:	https://github.com/CTSRD-CHERI/cheribsd/commit/1737d8397a0
MFC after:	3 days

(cherry picked from commit 47be48457393ba6747cc3144272b1f4d8b9077fb)


  Commit: dc2b9b57cea52511f95337f79df2263a0dd316ae
      https://github.com/MidnightBSD/src/commit/dc2b9b57cea52511f95337f79df2263a0dd316ae
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M stand/i386/boot2/boot2.c

  Log Message:
  -----------
  Adjust parse() definition in boot2 to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    stand/i386/boot2/boot2.c:358:6: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]

This is because parse() is declared with a (void) argument list, and
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit e60f6384f9dbe3abe83e59acf0997c591752ff81)


  Commit: 62b2917cc432ac9ba319240e6326d5b5016aa5fa
      https://github.com/MidnightBSD/src/commit/62b2917cc432ac9ba319240e6326d5b5016aa5fa
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/wpa/Makefile.inc

  Log Message:
  -----------
  WPA_DISTDIR does not need to end in a slash

Since all uses of the macro also append a slash, this leads to double
slashes.

MFC after:	3 days

(cherry picked from commit 9917049b60f7cf7345a09d2bc22d51764a477984)


  Commit: b05e3df69506e220f445bb47601c11ab65a56af1
      https://github.com/MidnightBSD/src/commit/b05e3df69506e220f445bb47601c11ab65a56af1
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/cxgb/cxgb_sge.c

  Log Message:
  -----------
  Remove unused but set variable in cxgb_sge

Clang 15 warns:

    sys/dev/cxgb/cxgb_sge.c:1290:21: error: variable 'txsd' set but not used [-Werror,-Wunused-but-set-variable]
            struct tx_sw_desc *txsd = &txq->sdesc[txqs->pidx];
                               ^

It appears 'txsd' is a leftover from a previous refactoring (see
3f345a5d09b6), but is no longer used for anything, and can be removed
without any functional change.

MFC after:	3 days
Reviewed by:	np
Differential Revision: https://reviews.freebsd.org/D35833

(cherry picked from commit cab040039d6fe1b2a6de8f2ba2cc882c313d3c75)


  Commit: 0d9a854c635a1a40a9f2f191f6acc02a3ecae330
      https://github.com/MidnightBSD/src/commit/0d9a854c635a1a40a9f2f191f6acc02a3ecae330
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/agp/agp.c

  Log Message:
  -----------
  Adjust agp_find_device() definition in agp.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/agp/agp.c:910:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    agp_find_device()
                   ^
                    void

This is because agp_find_device() is declared with a (void) argument
list, and defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit c0817e2aba26ceb683e9c649c22d7fcd9a921231)


  Commit: efd6983d2d5a3f5c32390da49d9ea90e974e0a4d
      https://github.com/MidnightBSD/src/commit/efd6983d2d5a3f5c32390da49d9ea90e974e0a4d
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/jail/jail.8

  Log Message:
  -----------
  jail.8: Fix formatting of synopsis and some code examples

MFC after:	3 days

(cherry picked from commit 203be0938dc5e1bd46b028f72077f8531e98a6cd)


  Commit: 3268f0dbb613cc185a8bfe401e4dfb227a015816
      https://github.com/MidnightBSD/src/commit/3268f0dbb613cc185a8bfe401e4dfb227a015816
  Author: Adam Wolk <a.wolk at fudosecurity.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/protect/protect.1

  Log Message:
  -----------
  protect.1: document existence of _oomprotect

Improve discoverability of the functionality by mentioning in the
userland tool manual. Add a SEE ALSO entry to rc.conf(5) where more
details are provided.

Sponsored by:   Fudo Security (a.wolk)
Differential Revision:	https://reviews.freebsd.org/D30334

(cherry picked from commit c8b6be0f7d1b92d11b279761685f61f6702700a1)


  Commit: f97471568b172a74864d6e52eb00c83c192329d4
      https://github.com/MidnightBSD/src/commit/f97471568b172a74864d6e52eb00c83c192329d4
  Author: Daniel Ebdrup Jensen <debdrup at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/protect/protect.1

  Log Message:
  -----------
  protect(1): Correct typo and add newline

Fix a typo, and move a sentence onto a new line in accordance with
mdoc(7) syntax.

While here, also remember to bump .Dd accordingly, as it was missed in
the prior commit.

Reported by:	maxim@

(cherry picked from commit bd1eafcdd02a6f559844aafe0dd0df34a356259d)


  Commit: 55b2209684e48d6859d32bf2ed328802a7d314c4
      https://github.com/MidnightBSD/src/commit/55b2209684e48d6859d32bf2ed328802a7d314c4
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/protect/protect.1

  Log Message:
  -----------
  protect.1: Improve synopsis

While here, make the list's -width argument a bit shorter for
readability.

MFC after:	3 days

(cherry picked from commit cb56f86025b88bc4174aa668b3966886b8420955)


  Commit: 65a6bde64da986c21839571705a67f5ca9174404
      https://github.com/MidnightBSD/src/commit/65a6bde64da986c21839571705a67f5ca9174404
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/protect/protect.1

  Log Message:
  -----------
  protect.1: Document that protect(1) does not work in jails

The reason is that in order to protect a process procctl(2) needs
the PRIV_VM_MADV_PROTECT privilege, which is currently denied in jails
(see kern_jail.c).

MFC after:	1 week

(cherry picked from commit 6452fb1e87ed9d00b52fa1e63e7c3a7516c9586c)


  Commit: 1247a002c260856b3ac4fe3b49d6bc18165882e8
      https://github.com/MidnightBSD/src/commit/1247a002c260856b3ac4fe3b49d6bc18165882e8
  Author: Ceri Davies <ceri at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man5/rc.conf.5

  Log Message:
  -----------
  rc.conf.5: -Tlint fixes.

(cherry picked from commit 2ce58512957ec373abfb71712687d7e7b6abea82)


  Commit: 6f4698fa483d119327ec0725ed9514fb8d67b626
      https://github.com/MidnightBSD/src/commit/6f4698fa483d119327ec0725ed9514fb8d67b626
  Author: Daniel Ebdrup Jensen <debdrup at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man5/rc.conf.5

  Log Message:
  -----------
  rc.conf(5): Add _limits, _login_class, and _oomprotect

Add a few very useful variables that might easily be overlooked, since
they're only documented in rc.subr(8) which might not be the first place
that people look.

At least _oomprotect has existed since 11.0-RELEASE, and doesn't appear
to be very well-known. While the others aren't as new, in my estimation,
a lot more people would use them if they knew about them.

While here, also add a reference to rc.subr(8) and login.conf(5), and
sort the variables alphabetically.

Reported by: 	Daniel Dettlaff <dmilith at gmail.com>
Reviewed by:	ceri, gbe, 0mp, ygy, a.wolk, pauamma

(cherry picked from commit bd6dce978c1a4d4472c98ff5685de3c2f2bd0203)


  Commit: c78f3299f8bb38c01b7c74ad7f7c5a24c47d02d3
      https://github.com/MidnightBSD/src/commit/c78f3299f8bb38c01b7c74ad7f7c5a24c47d02d3
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man5/rc.conf.5

  Log Message:
  -----------
  rc.conf.5: Improve documentation of <name>_oomprotect

Apart from improving readability, this commit mentions that
<name>_oomprotect is ignored in a jail environment. Also, replace
${name}_cmd with the correct ${argument}_cmd and point the reader to
rc.subr(8).

MFC after:	1 week

(cherry picked from commit df1817a81e891c4850157e7f21f94b113d663bec)


  Commit: 55b2ad17009f2ed6ca484f6d91a16ac98813fbf8
      https://github.com/MidnightBSD/src/commit/55b2ad17009f2ed6ca484f6d91a16ac98813fbf8
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man5/sysctl.conf.5

  Log Message:
  -----------
  sysctl.conf.5: Document rc.d/sysctl and rc.d/sysctl_lastload

Also, update the BUGS section. The example describes an issue, which is
not true anymore thanks to sysctl_lastload. Point readers to rcorder(8)
instead.

MFC after:	2 weeks

(cherry picked from commit 383ccaa4050e3cbbd8ce8163c8aebd07c3d94ab1)


  Commit: 414ee77415cc0a4e7d972713ca6a5976627b2e3f
      https://github.com/MidnightBSD/src/commit/414ee77415cc0a4e7d972713ca6a5976627b2e3f
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man8/rescue.8

  Log Message:
  -----------
  rescure.8: Do not recommend release artifact disc2

The FreeBSD project does not publish disc2 image anymore.

MFC after:	2 weeks

(cherry picked from commit 7963c02c9bc222e8ac8c1a3acb87451bd74b9733)


  Commit: 5214fa858bd20bf9e7f9a39a4bde80316e9fc4db
      https://github.com/MidnightBSD/src/commit/5214fa858bd20bf9e7f9a39a4bde80316e9fc4db
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/dtrace/dtrace_unload.c

  Log Message:
  -----------
  Adjust dtrace_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    In file included from sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c:18440:
    sys/cddl/dev/dtrace/dtrace_unload.c:26:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtrace_unload()
                 ^
                  void

This is because dtrace_unload() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 6f5f44562a72e739a39057a4661a56498e4c79b5)


  Commit: 4595e21a47ae84cb2915eb5fd874475063dc811d
      https://github.com/MidnightBSD/src/commit/4595e21a47ae84cb2915eb5fd874475063dc811d
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/dtmalloc/dtmalloc.c

  Log Message:
  -----------
  Adjust dtmalloc_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/dev/dtmalloc/dtmalloc.c:177:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtmalloc_unload()
                   ^
                    void

This is because dtmalloc_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit a0c55bac79ef684db5f3645fdc1e0fd8da827985)


  Commit: 471c9d84994d6e5c38af114c7903c0f27a54cf2d
      https://github.com/MidnightBSD/src/commit/471c9d84994d6e5c38af114c7903c0f27a54cf2d
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/fb/fbd.c

  Log Message:
  -----------
  Adjust fbd_list() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/dev/fb/fbd.c:205:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    fbd_list()
            ^
             void

This is because fbd_list() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 9863e501c8d482dc47e856a2778dc3cbf6eb6d22)


  Commit: 9cb917f6edc4246bf49eb95556bcfde0bbcdea1e
      https://github.com/MidnightBSD/src/commit/9cb917f6edc4246bf49eb95556bcfde0bbcdea1e
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c

  Log Message:
  -----------
  Adjust dtrace_getf_barrier() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c:17019:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtrace_getf_barrier()
		       ^
			void

This is because dtrace_getf_barrier() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit bd0e3cc2e71079f54785b7a395faf3a66426936e)


  Commit: 194eb0ea06f4e911d1b28182fdc30c0cbafef482
      https://github.com/MidnightBSD/src/commit/194eb0ea06f4e911d1b28182fdc30c0cbafef482
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/nfsclient/nfs_clkdtrace.c

  Log Message:
  -----------
  Adjust dtnfsclient_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/fs/nfsclient/nfs_clkdtrace.c:544:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtnfsclient_unload()
                      ^
                       void

This is because dtnfsclient_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 276099434d35b0abd09da946f06c8b8d9765452b)


  Commit: 6e014d1a0b6a3560e4b63178db053b1c21829185
      https://github.com/MidnightBSD/src/commit/6e014d1a0b6a3560e4b63178db053b1c21829185
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M lib/msun/src/math.h

  Log Message:
  -----------
  Remove unnecessary const and volatile qualifiers from __fp_type_select()

Since https://github.com/llvm/llvm-project/commit/ca75ac5f04f2, clang 15
has a new warning about _Generic selection expressions, such as used in
math.h:

    lib/libc/gdtoa/_ldtoa.c:82:10: error: due to lvalue conversion of the controlling expression, association of type 'volatile float' will never be selected because it is qualified [-Werror,-Wunreachable-code-generic-assoc]
            switch (fpclassify(u.e)) {
                    ^
    lib/msun/src/math.h:109:2: note: expanded from macro 'fpclassify'
            __fp_type_select(x, __fpclassifyf, __fpclassifyd, __fpclassifyl)
            ^
    lib/msun/src/math.h:85:14: note: expanded from macro '__fp_type_select'
        volatile float: f(x),                                               \
                 ^

This is because the controlling expression always undergoes lvalue
conversion first, dropping any cv-qualifiers. The 'const', 'volatile',
and 'volatile const' associations will therefore never be used.

MFC after:	1 week
Reviewed by:	theraven
Differential Revision: https://reviews.freebsd.org/D35815

(cherry picked from commit e50027e38d4f93887691f87b024e0abf37e98c78)


  Commit: ef426f5afa82eaa3d04e4f1171ba02b4ac600e03
      https://github.com/MidnightBSD/src/commit/ef426f5afa82eaa3d04e4f1171ba02b4ac600e03
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/profile/profile.c

  Log Message:
  -----------
  Adjust profile_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/dev/profile/profile.c:640:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    profile_unload()
                  ^
                   void

This is because profile_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 2d03b58f9a3d5ec1deb35de594fcee22d06bfbb2)


  Commit: 11724c5653971b29f10349f1436ed39a31bebe87
      https://github.com/MidnightBSD/src/commit/11724c5653971b29f10349f1436ed39a31bebe87
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/ddb/db_lex.c

  Log Message:
  -----------
  Adjust db_flush_line() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/ddb/db_lex.c:94:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    db_flush_line()
                 ^
                  void

This is because db_flush_line() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 939cb349b2ca4d3fcdc72ab1258eadee5e54881c)


  Commit: b5bb167669cdf199079e4a59c5bed6f91bd5e257
      https://github.com/MidnightBSD/src/commit/b5bb167669cdf199079e4a59c5bed6f91bd5e257
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/cxgbe/t4_tracer.c

  Log Message:
  -----------
  Adjust t4_tracer_mod{load,unload}() definitions to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/dev/cxgbe/t4_tracer.c:234:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    t4_tracer_modload()
                     ^
                      void
    sys/dev/cxgbe/t4_tracer.c:243:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    t4_tracer_modunload()
                       ^
                        void

This is because t4_tracer_modload() and t4_tracer_modunload() are
declared with a (void) argument list, but defined with an empty argument
list. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 54e5efb2643ec5f4bf40fef2a1937cd5449a58a0)


  Commit: 46e06dd9ac44454fbad2f12d044383af880f32a0
      https://github.com/MidnightBSD/src/commit/46e06dd9ac44454fbad2f12d044383af880f32a0
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/prototype.c

  Log Message:
  -----------
  Adjust prototype_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/dev/prototype.c:99:17: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    prototype_unload()
                    ^
                     void

This is because prototype_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 9a979788832e1c31d58923e4c780a6c4b05335d0)


  Commit: 099cec457a99d5fb0b68043de5150f106e453f0c
      https://github.com/MidnightBSD/src/commit/099cec457a99d5fb0b68043de5150f106e453f0c
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/mfi/mfi.c

  Log Message:
  -----------
  Suppress unused variable warning in mfi.c

With clang 15, the following -Werror warnings are produced:

    sys/dev/mfi/mfi.c:3698:6: error: variable 'timedout' set but not used [-Werror,-Wunused-but-set-variable]
            int timedout;
                ^
    sys/dev/mfi/mfi.c:3742:6: error: variable 'timedout' set but not used [-Werror,-Wunused-but-set-variable]
            int timedout = 0;
                ^

Here, 'timedout' are variables that are only used when debugging,
requiring #if 0 statements to be modified. Mark the variables as
potentially unused, to suppress the warnings.

MFC after:	3 days

(cherry picked from commit 3dbe05f61b65a73582aefdc2ee5a50ad2b4390ef)


  Commit: 0cf73959b7a8b5aa5cfafb80b2712e93fb33c928
      https://github.com/MidnightBSD/src/commit/0cf73959b7a8b5aa5cfafb80b2712e93fb33c928
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/malo/if_malo.c

  Log Message:
  -----------
  Suppress unused variable warning in if_malo.c

With clang 15, the following -Werror warning is produced:

    sys/dev/malo/if_malo.c:1573:8: error: variable 'ix' set but not used [-Werror,-Wunused-but-set-variable]
            u_int ix;
                  ^

Here, 'ix' is a variable that is only used when MALO_DEBUG is defined.
Mark the variable as potentially unused, to suppress the warning.

MFC after:	3 days

(cherry picked from commit 218634014374de0032fcdd56656ed6b3650634d2)


  Commit: f962b4905206c86ac212658de8b5f82232dbf508
      https://github.com/MidnightBSD/src/commit/f962b4905206c86ac212658de8b5f82232dbf508
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/ipfw/ip_dummynet.c

  Log Message:
  -----------
  Suppress unused variable warning in ip_dummynet.c

With clang 15, the following -Werror warning is produced:

    sys/netpfil/ipfw/ip_dummynet.c:802:6: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
            int n = 0; /* only for stats */
                ^

Here, 'n' is a variable that is only used when debugging. Mark the
variable as potentially unused, to suppress the warning.

MFC after:	3 days

(cherry picked from commit 5c329f0a4d32cec54250ec2d3f61455e85137a6f)


  Commit: 33b52c88605ad71df3fed719c36557df66ccdb62
      https://github.com/MidnightBSD/src/commit/33b52c88605ad71df3fed719c36557df66ccdb62
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/alc/if_alc.c

  Log Message:
  -----------
  Fix unused variable warning in if_alc.c

With clang 15, the following -Werror warning is produced:

    sys/dev/alc/if_alc.c:3441:6: error: variable 'prog' set but not used [-Werror,-Wunused-but-set-variable]
            int prog;
                ^

The 'prog' variable seems to be a left-over from some debugging code
that no longer exists, and can be removed without any functional change.

MFC after:	3 days
Differential Revision: https://reviews.freebsd.org/D35831

(cherry picked from commit 64741244fc4588eefd954948b77ddf2706448ecd)


  Commit: 6b68a5d7b7dae279494625a0ca24a71eb278bc28
      https://github.com/MidnightBSD/src/commit/6b68a5d7b7dae279494625a0ca24a71eb278bc28
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/nvd/nvd.c

  Log Message:
  -----------
  Adjust nvd_{load,unload}() definitions to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/dev/nvd/nvd.c:150:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    nvd_load()
            ^
             void
    sys/dev/nvd/nvd.c:166:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    nvd_unload()
              ^
               void

This is because nvd_load() and nvd_unload() are declared with a (void)
argument list, but defined with an empty argument list. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit c46c9b3f5f1eb5575a5e42f52872dbea9cf7516f)


  Commit: d1ac14593a573f663c40e37538179d6f629b21da
      https://github.com/MidnightBSD/src/commit/d1ac14593a573f663c40e37538179d6f629b21da
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/mwl/if_mwl.c

  Log Message:
  -----------
  Suppress unused variable warning in if_mwl.c

With clang 15, the following -Werror warning is produced:

    sys/dev/mwl/if_mwl.c:3445:8: error: variable 'ix' set but not used [-Werror,-Wunused-but-set-variable]
            u_int ix;
                  ^

Here, 'ix' is a variable that is only used when debugging. Mark the
variable as potentially unused, to suppress the warning.

MFC after:	3 days

(cherry picked from commit 52c80d495a1b9dc756452ebcbb945906ea3cf23a)


  Commit: dd133d0695e2ba223db39c496fa634bbfa690ebc
      https://github.com/MidnightBSD/src/commit/dd133d0695e2ba223db39c496fa634bbfa690ebc
  Author: Rick Macklem <rmacklem at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/nfsclient/nfs_clrpcops.c

  Log Message:
  -----------
  nfscl: Fix setting of nfsess_defunct for nfscl_hasexpired()

Commit a7bb120f8b87 added a printf for the case where recovery
has not marked the session defunct by setting nfsess_defunct
to 1.  It turns out that nfscl_hasexpired() calls
nfsrpc_setclient() directly, without setting nfsess_defunct.
This patch replaces the printf with code that sets
nfsess_defunct to 1 to handle this case.

If SIGTERM is issued to a process when it is doing I/O on
an "intr" mount, the NFSv4 server may reply NFSERR_BADSTATEID,
due to the Open being prematurely closed.
This can result in a call to nfscl_hasexpired() to do a
recovery.

This would explain at least one hang described in the PR.

PR: 260011
MFC after:	2 weeks

(cherry picked from commit be7b87de16ffbabb81989e13a4b19a178e3ab8ee)


  Commit: 3179c6e7148f63a27c4c8071a9ff89d9b9236d7b
      https://github.com/MidnightBSD/src/commit/3179c6e7148f63a27c4c8071a9ff89d9b9236d7b
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netipsec/ipsec_mbuf.c

  Log Message:
  -----------
  Fix unused variable warning in ipsec_mbuf.c

With clang 15, the following -Werror warning is produced:

    sys/netipsec/ipsec_mbuf.c:93:24: error: variable 'alloc' set but not used [-Werror,-Wunused-but-set-variable]
                    int todo, len, done, alloc;
                                         ^

The 'alloc' variable appears to have been a debugging aid that has never
been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit df5d2841d507589af0de7301f6cee3d2b98a35be)


  Commit: 3dc743007b3bb2fd191ef1fcdae19bb6a35c8040
      https://github.com/MidnightBSD/src/commit/3dc743007b3bb2fd191ef1fcdae19bb6a35c8040
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/vt/vt_core.c

  Log Message:
  -----------
  Adjust vt_mouse_paste() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/vt/vt_core.c:2129:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    vt_mouse_paste()
                  ^
                   void

This is because vt_mouse_paste() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit b77a5e5f5835620ce27114fad9a211d960ed60aa)


  Commit: c370139a84a9faab71c398bd364afb61da7c3e9a
      https://github.com/MidnightBSD/src/commit/c370139a84a9faab71c398bd364afb61da7c3e9a
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/hwpmc/hwpmc_logging.c

  Log Message:
  -----------
  Adjust pcmlog_{initialize,shutdown}() definitions to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    sys/dev/hwpmc/hwpmc_logging.c:1228:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pmclog_initialize()
                     ^
                      void
    sys/dev/hwpmc/hwpmc_logging.c:1277:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pmclog_shutdown()
                   ^
                    void

This is because pcmlog_{initialize,shutdown}() are declared with (void)
argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit ba95c556029357800d18a5bc5abd02a2b7d0c9de)


  Commit: e5e9ed655cc5f1ee44b4af7a30da90ccae0acac9
      https://github.com/MidnightBSD/src/commit/e5e9ed655cc5f1ee44b4af7a30da90ccae0acac9
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h

  Log Message:
  -----------
  Adjust tdsaContext_t::NvmdResponseSet declaration to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    In file included from sys/dev/pms/freebsd/driver/ini/src/agtiapi.c:70:
    sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h:346:13: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
      volatile  NvmdResponseSet;
      ~~~~~~~~  ^
      int

The NvmdResponseSet member is effectively only used as a boolean in the
pms(4) driver, so it could be a single bit. But to avoid changing the
semantics at all in this unmaintained driver, simply declare it as a
volatile int.

MFC after:	3 days

(cherry picked from commit 95204d7a6368990e216db0ad51ef3e6018aed27c)


  Commit: 791bff0bd0e0f8fe9613a5e66f9bd2f1cb9f82ac
      https://github.com/MidnightBSD/src/commit/791bff0bd0e0f8fe9613a5e66f9bd2f1cb9f82ac
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/hwpmc/hwpmc_mod.c

  Log Message:
  -----------
  Fix unused variable warnings in hwpmc_mod.c

With clang 15, the following -Werror warnings are produced:

    sys/dev/hwpmc/hwpmc_mod.c:4805:6: error: variable 'nfree' set but not used [-Werror,-Wunused-but-set-variable]
            int nfree;
                ^
    sys/dev/hwpmc/hwpmc_mod.c:4804:6: error: variable 'ncallchains' set but not used [-Werror,-Wunused-but-set-variable]
            int ncallchains;
                ^

The 'nfree' and 'ncallchains' variables were used in KASSERTs, but these
were removed due to refactoring in d9f1b8dbf29d. Remove the variables
since they no longer serve any purpose.

MFC after:      3 days

(cherry picked from commit 38a9b8a00ce933e99b4a643cdcc3220be82e7d62)


  Commit: 139df67ac05e1a65427f1c4d6e792f35a75679ef
      https://github.com/MidnightBSD/src/commit/139df67ac05e1a65427f1c4d6e792f35a75679ef
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ocs_fc/ocs_cam.c

  Log Message:
  -----------
  Fix unused variable warning in ocs_cam.c

With clang 15, the following -Werror warning is produced:

    sys/dev/ocs_fc/ocs_cam.c:2556:11: error: variable 'count' set but not used [-Werror,-Wunused-but-set-variable]
            uint32_t        count;
                            ^

The 'count' variable seems to be a left-over from some debugging code
that no longer exists, and can be removed without any functional change.

MFC after:	3 days

(cherry picked from commit 8d9e29284627f5e860b7fc194e9fedd6b21f7783)


  Commit: facfa8e3b44e2d0489b390663992202a2b423553
      https://github.com/MidnightBSD/src/commit/facfa8e3b44e2d0489b390663992202a2b423553
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/ipfw/ip_fw_sockopt.c

  Log Message:
  -----------
  Adjust ipfw_{init,destroy}_sopt_handler() definitions to avoid clang 15 warning

With clang 15, the following -Werror warning are produced:

    sys/netpfil/ipfw/ip_fw_sockopt.c:3477:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_init_sopt_handler()
                          ^
                           void
    sys/netpfil/ipfw/ip_fw_sockopt.c:3485:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_destroy_sopt_handler()
                             ^
                              void

This is because ipfw_init_sopt_handler() and ipfw_destroy_sopt_handler()
are declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit d62830c5e493133b0212f39c7efdab4232f87abf)


  Commit: 1727f52a6e7abce5f276342a1df2bfddb9c534f9
      https://github.com/MidnightBSD/src/commit/1727f52a6e7abce5f276342a1df2bfddb9c534f9
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/hwpmc/hwpmc_x86.c

  Log Message:
  -----------
  Adjust pcm_md_initialize() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/hwpmc/hwpmc_x86.c:245:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pcm_md_initialize()
                     ^
                      void

This is because pcm_md_initialize() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit dc0cde7a21a6aab0a5e876d8f890764e32718932)


  Commit: ca9cc44e4571bea412956cbe4be896c35348f292
      https://github.com/MidnightBSD/src/commit/ca9cc44e4571bea412956cbe4be896c35348f292
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/fbt/fbt.c

  Log Message:
  -----------
  Adjust fbt_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/cddl/dev/fbt/fbt.c:1273:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    fbt_unload()
              ^
               void

This is because fbt_unload() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 6339314c737f44477c1168819353087c2f4816eb)


  Commit: e22e3078187380568b107453e3f1dd651041fcb3
      https://github.com/MidnightBSD/src/commit/e22e3078187380568b107453e3f1dd651041fcb3
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/hwpmc/hwpmc_mod.c

  Log Message:
  -----------
  Adjust pmc_thread_descriptor_pool_drain() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/hwpmc/hwpmc_mod.c:2462:33: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pmc_thread_descriptor_pool_drain()
                                    ^
                                     void

This is because pmc_thread_descriptor_pool_drain() is declared with a
(void) argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 555d2c9394fa673241fd26a95152adfb9d20952e)


  Commit: 9fcc165fe333296a4b5bde02dc0146017532786c
      https://github.com/MidnightBSD/src/commit/9fcc165fe333296a4b5bde02dc0146017532786c
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/ipfw/ip_fw_iface.c

  Log Message:
  -----------
  Adjust iface_khandler_deregister() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netpfil/ipfw/ip_fw_iface.c:159:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    iface_khandler_deregister()
                             ^
                              void

This is because iface_khandler_deregister() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 4100dc46c78cef408369c0fc8dcfd1f87783a1ca)


  Commit: dad3a5a53894031081c28bbcc66da5fc10d18266
      https://github.com/MidnightBSD/src/commit/dad3a5a53894031081c28bbcc66da5fc10d18266
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/ipfw/ip_fw_sockopt.c

  Log Message:
  -----------
  Adjust ipfw_{init,destroy}_*() definitions to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/ipfw/ip_fw_sockopt.c:187:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_init_counters()
                      ^
                       void
    sys/netpfil/ipfw/ip_fw_sockopt.c:196:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_destroy_counters()
                         ^
                          void
    sys/netpfil/ipfw/ip_fw_sockopt.c:3241:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_init_obj_rewriter()
                          ^
                           void
    sys/netpfil/ipfw/ip_fw_sockopt.c:3249:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_destroy_obj_rewriter()
                             ^
                              void

This is because ipfw_init_counters(), ipfw_destroy_counters(),
ipfw_init_obj_rewriter(), and ipfw_destroy_obj_rewriter() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 62030bb8538cb3775f6259c81c2c30a533f3ab10)


  Commit: 79d142e10d6fb874b468361e6c16c5352aee650f
      https://github.com/MidnightBSD/src/commit/79d142e10d6fb874b468361e6c16c5352aee650f
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/net/if_lagg.c

  Log Message:
  -----------
  Fix unused variable warning in if_lagg.c

With clang 15, the following -Werror warning is produced:

    sys/net/if_lagg.c:2413:6: error: variable 'active_ports' set but not used [-Werror,-Wunused-but-set-variable]
            int active_ports = 0;
                ^

The 'active_ports' variable appears to have been a debugging aid that
has never been used for anything (ref https://reviews.freebsd.org/D549),
so remove it.

MFC after:	3 days

(cherry picked from commit fa267a329ffa3d0e02c3c3a52dd5df5231d92cba)


  Commit: c6ccd1b5af5e98e4f92438322c3e0a65ccec3f3e
      https://github.com/MidnightBSD/src/commit/c6ccd1b5af5e98e4f92438322c3e0a65ccec3f3e
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/net/iflib.c

  Log Message:
  -----------
  Fix unused variable warning in iflib.c

With clang 15, the following -Werror warning is produced:

    sys/net/iflib.c:993:8: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
            u_int n;
                  ^

The 'n' variable appears to have been a debugging aid that has never
been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit 0294e95da4aa272906d4472137b1235d8d8a7180)


  Commit: cd64dba294397d0a2d1e514695dc19be74cdb65c
      https://github.com/MidnightBSD/src/commit/cd64dba294397d0a2d1e514695dc19be74cdb65c
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/ipfw/ip_fw_iface.c

  Log Message:
  -----------
  Adjust ipfw_iface_{init,destroy}() definitions to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/ipfw/ip_fw_iface.c:206:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_iface_init()
                   ^
                    void
    sys/netpfil/ipfw/ip_fw_iface.c:219:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_iface_destroy()
                      ^
                       void

This is because ipfw_iface_init() and ipfw_iface_destroy() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 1eea6b9097834484f2238298f550bb418901c313)


  Commit: bcfcea69539dc84d306a0c0364ef9b538283ef96
      https://github.com/MidnightBSD/src/commit/bcfcea69539dc84d306a0c0364ef9b538283ef96
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/netmap/if_re_netmap.h

  Log Message:
  -----------
  Fix unused variable warning in if_re_netmap.h

With clang 15, the following -Werror warning is produced:

    sys/dev/netmap/if_re_netmap.h:179:8: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
            u_int n;
                  ^

The 'n' variable appears to have been a debugging aid that has never
been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit 8bfedf5852bcb846bfdd2a54989d65cdbb16f7ef)


  Commit: 77e8199eb3453deef66e0d4cb2165e0e94d6d767
      https://github.com/MidnightBSD/src/commit/77e8199eb3453deef66e0d4cb2165e0e94d6d767
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/firewire/fwohci.c

  Log Message:
  -----------
  Fix unused variable warning in fwohci.c

With clang 15, the following -Werror warning is produced:

    sys/dev/firewire/fwohci.c:2762:23: error: variable 'pcnt' set but not used [-Werror,-Wunused-but-set-variable]
            int len, plen, hlen, pcnt, offset;
                                 ^

The 'pcnt' variable is eventually used only in an #if 0'd block,
obviously meant for debugging. Ensure that 'pcnt' is only declared and
used when COUNT_PACKETS is defined, so the debugging can be easily
turned on later, if desired.

MFC after:	3 days

(cherry picked from commit d7e0d962f39877b997454992a980f4122c6316e7)


  Commit: 1775bef2ab25e99ecc4f575753ddcdf9f8148701
      https://github.com/MidnightBSD/src/commit/1775bef2ab25e99ecc4f575753ddcdf9f8148701
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/ipfw/ip_fw_iface.c

  Log Message:
  -----------
  Adjust iface_khandler_register() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netpfil/ipfw/ip_fw_iface.c:128:24: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    iface_khandler_register()
                           ^
                            void

This is because iface_khandler_register() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit edf1e1f78da8c2a19bcee90fe0f72cac2eb18e30)


  Commit: 8da61a613223ad66bf2229bcc11bcdd7d92c0d78
      https://github.com/MidnightBSD/src/commit/8da61a613223ad66bf2229bcc11bcdd7d92c0d78
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M contrib/blacklist/bin/blacklistd.conf.5

  Log Message:
  -----------
  blacklistd.conf.5: typo/grammar fixes

PR:		246467
Submitted by:	Mike Lempriere

(cherry picked from commit 36b1f67ca1605b7a0caf204dfce42e7e4d057272)


  Commit: c03fdf60fc4f0ed5d3695e55dfd526bf4eac53a3
      https://github.com/MidnightBSD/src/commit/c03fdf60fc4f0ed5d3695e55dfd526bf4eac53a3
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M contrib/blacklist/bin/blacklistd.conf.5

  Log Message:
  -----------
  blacklistd.conf.5: pluralization correction

Submitted by:	bcr in review D22259
MFC with:	r354399

(cherry picked from commit 9999fa1cd0e8bf8e350c8e65cdb05458820b730e)


  Commit: 0f27fddffe088cde0322c1a01cf0158ff8eeb835
      https://github.com/MidnightBSD/src/commit/0f27fddffe088cde0322c1a01cf0158ff8eeb835
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M contrib/blacklist/lib/bl.c

  Log Message:
  -----------
  blacklistd: Handle 0 sized messages

Patch obtained from https://github.com/zoulasc/blocklist commit
ada75856bc6fcabbdd25ffbe08fbad5cf2a2c08a

PR:		264599
MFC after:	1 week

(cherry picked from commit b1e81e6ddee42efb0f0d49cfc6cebb48d52e3f08)


  Commit: d46f4c84c0dc98f9ef3458153c2294ecfa55620c
      https://github.com/MidnightBSD/src/commit/d46f4c84c0dc98f9ef3458153c2294ecfa55620c
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/bsdinstall/bsdinstall.8

  Log Message:
  -----------
  beinstall.8: Update example distsites for BSDINSTALL_DISTSITE

MFC after:	1 week

(cherry picked from commit aa35037ba565bf9f6d5946515ecdcc61a5b22ebb)


  Commit: 442206aa9f4de19385f48992811441c3a5797249
      https://github.com/MidnightBSD/src/commit/442206aa9f4de19385f48992811441c3a5797249
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man5/tmpfs.5

  Log Message:
  -----------
  tmpfs.5: Add fstab line example

MFC after:	3 days

(cherry picked from commit 7c2ec6cdf575de11d5ed33109d92e757dd3d072c)


  Commit: e1630be89ae2b57a9d9d93ad97569125c10d96c1
      https://github.com/MidnightBSD/src/commit/e1630be89ae2b57a9d9d93ad97569125c10d96c1
  Author: Mateusz Piotrowski <0mp at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man5/tmpfs.5

  Log Message:
  -----------
  tmpfs.5: Fix typos and linter warnings

MFC after:	3 days

(cherry picked from commit 2b693e4829265e1e9f73b628c139701e1c259b24)


  Commit: 218ca034326f6adaf58f35b2b6b9000f5b58ceaa
      https://github.com/MidnightBSD/src/commit/218ca034326f6adaf58f35b2b6b9000f5b58ceaa
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/vtfontcvt/vtfontcvt.c

  Log Message:
  -----------
  vtfontcvt: improve hex font format validation

Previously an EOF would result in sscanf returning -1 leading to a
crash.

MFC after:	1 week
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 119db52f4228fae161306ac29dc739638c132c26)


  Commit: fdde6f1efd069f24f7cb5862939f4abffdd6eba3
      https://github.com/MidnightBSD/src/commit/fdde6f1efd069f24f7cb5862939f4abffdd6eba3
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.h
    M sys/dev/ena/ena_datapath.c
    M sys/dev/ena/ena_netmap.c

  Log Message:
  -----------
  ena: Add ena_ring_tx_doorbell() function

Add ena_ring_tx_doorbell function to remove code duplication.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 3501d4f17e8cc0350b8deff671f9991cc7ac280c)


  Commit: 54442a91f0b23fa0401aace37f2e7157d2db56d8
      https://github.com/MidnightBSD/src/commit/54442a91f0b23fa0401aace37f2e7157d2db56d8
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c

  Log Message:
  -----------
  ena: Move reset completion logging to the reset function

While ena_restore_device is called from the reset task, it can also be
called from other locations in the driver, for example in netmap
specific code. Move the reset completion logging to reset task, so it
better represents when the reset actually happened.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit d209ffee155dd5e505f174a356c8f50c96ebf57e)


  Commit: 92c22df0db0d9ea30a74b186f814abd7ec286c2a
      https://github.com/MidnightBSD/src/commit/92c22df0db0d9ea30a74b186f814abd7ec286c2a
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena_datapath.c
    M sys/dev/ena/ena_netmap.c

  Log Message:
  -----------
  ena: Extend debug prints for invalid req_id resets

Print information about qid if req_id is invalid. Add information about
qid and req_id if mbuf is invalid.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit a9c39b031fe89a6414174e3db82da6548d7fff0f)


  Commit: 32f0571ec266e99cc90dba358b92720b0d56c5a0
      https://github.com/MidnightBSD/src/commit/32f0571ec266e99cc90dba358b92720b0d56c5a0
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c

  Log Message:
  -----------
  ena: Prevent LLQ initialization when membar isn't exposed

The ena_com_config_dev_mode() function performs many LLQ related
calculations and sends an admin command to configure LLQ in the device.

All the LLQ related operations are unnecessary if the driver fails to
find LLQ memory bar.

Move LLQ memory bar allocation to separate helper function
ena_map_llq_mem_bar and execute this function before LLQ configuration.
If the LLQ memory bar cannot be allocated, then LLQ configuration is
skipped.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 90232d18ca4f7a5a3073a8279a9b9d3228df5f87)


  Commit: 0d32a4d4b3804d0b2ffa36641c78c8f11a7dd454
      https://github.com/MidnightBSD/src/commit/0d32a4d4b3804d0b2ffa36641c78c8f11a7dd454
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c
    M sys/dev/ena/ena.h
    M sys/dev/ena/ena_datapath.c

  Log Message:
  -----------
  ena: Store ticks of last Tx cleanup

Store timestamp of last cleanup in Tx ring structure. This does not
change anything during normal operation of the driver but could be
useful when the device fails for some reason.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit d8aba82b5ca75f1a5bff609af141844c4fc9de70)


  Commit: 2b5c56304d336f6a2a2744e2f8173dabe141a6e7
      https://github.com/MidnightBSD/src/commit/2b5c56304d336f6a2a2744e2f8173dabe141a6e7
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c
    M sys/dev/ena/ena_datapath.c

  Log Message:
  -----------
  ena: Use atomic_load/store functions for first_interrupt variable

Surround cases of possible simultaneous access to the first_interrupt
variable with atomic_load/store functions.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 0ac122c388d9a5e189e60378f1950b82a22bbdd1)


  Commit: 4716b7e76ea318e7f46de5d8369e89561d8d0832
      https://github.com/MidnightBSD/src/commit/4716b7e76ea318e7f46de5d8369e89561d8d0832
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c
    M sys/dev/ena/ena.h

  Log Message:
  -----------
  ena: Move ena_copy_eni_metrics into separate task

Copying ENI metrics was done in callout context, this caused the driver
to panic when sample_interval was set to a value other than 0, as the
admin queue call which was executed could sleep while waiting on
a condition variable. Taskqueue, unlike callout, allows for sleeping, so
moving the function to a separate taskqueue fixes the problem.
ena_timer_service is still responsible for scheduling the taskqueue.

Stop draining the callout during ena_up/ena_down. This was done to
prevent a race between ena_up/down and ena_copy_eni_metrics admin queue
calls. Since ena_metrics_task is protected by ENA_LOCK there is no
possibility of a race between ena_up/down and ena_metrics_task.

Remove a comment about locking in ena_timer_service. With ENI metrics
in a separate task this comment became obsolete.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit b899a02ad7330cae3c9bb08ad7975601dc3b9551)


  Commit: 3951a749d3c7833f810433f2c571c16d0aa475e9
      https://github.com/MidnightBSD/src/commit/3951a749d3c7833f810433f2c571c16d0aa475e9
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c

  Log Message:
  -----------
  ena: Use device_set_desc in probe

During probe the driver created a temporary buffer to which the value of
DEVICE_DESC constant was printed. This buffer was then copied to the
device structure using device_set_desc_copy. Since the value of this
string is exactly the same for every device using the ENA driver, using
sprintf is unnecessary, and device_set_desc can be used instead.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 755e60ca046390bdcfc097b6a8f1a032d47a7b65)


  Commit: dae956a7081df6528757a69341aa31135a95c5ff
      https://github.com/MidnightBSD/src/commit/dae956a7081df6528757a69341aa31135a95c5ff
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c
    M sys/dev/ena/ena.h
    M sys/dev/ena/ena_datapath.c
    M sys/dev/ena/ena_datapath.h
    M sys/dev/ena/ena_netmap.c
    M sys/dev/ena/ena_netmap.h
    M sys/dev/ena/ena_rss.c
    M sys/dev/ena/ena_rss.h
    M sys/dev/ena/ena_sysctl.c
    M sys/dev/ena/ena_sysctl.h

  Log Message:
  -----------
  ena: Fix styling issues

Align code style with FreeBSD style(9) guidelines.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 82e558eacf222ac497bc11fa9f2c7778e97fbc7a)


  Commit: a4972838813f2820c5040eb3f05354feaac67c29
      https://github.com/MidnightBSD/src/commit/a4972838813f2820c5040eb3f05354feaac67c29
  Author: Michal Krawczyk <mk at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena_datapath.c

  Log Message:
  -----------
  ena: Remove write-only datapath variable

The ena_qid variable value is never used. It can be safely removed.
That also silences the compilation warning.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit d5d5ea87236d8f839cad84296f23d285a696195c)


  Commit: 364306bdef0cad699e8d1115655c868412741021
      https://github.com/MidnightBSD/src/commit/364306bdef0cad699e8d1115655c868412741021
  Author: Dawid Gorecki <dgr at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c
    M sys/dev/ena/ena.h
    M sys/dev/ena/ena_datapath.c
    M sys/dev/ena/ena_netmap.c
    M sys/dev/ena/ena_sysctl.c

  Log Message:
  -----------
  ena: Align names of constants

Most of the constants in ena.h file were prefixed with ENA_*, while
others did not have this prefix. Align the constants by prefixing the
remaining constants with ENA.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 8f15f8a72b5474b81c5951d4039d203b2d80e2e3)


  Commit: 2779a9e110947b66d4b9118c5d4fc9a3966a3133
      https://github.com/MidnightBSD/src/commit/2779a9e110947b66d4b9118c5d4fc9a3966a3133
  Author: Michal Krawczyk <mk at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena_netmap.c

  Log Message:
  -----------
  ena: Fix invalid KASSERT test in netmap code

The KASSERT was originally added to ensure that the netmap Rx ring is
not NULL, however, it was checking for the opposite.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 79770fdad6c18d968cc122c4294820931cc542e0)


  Commit: 59f21cf91327ea3482b30aee5799dcd367e66beb
      https://github.com/MidnightBSD/src/commit/59f21cf91327ea3482b30aee5799dcd367e66beb
  Author: Michal Krawczyk <mk at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.h

  Log Message:
  -----------
  ena: Update driver version to v2.6.0

Some of the changes in this release:
* Style fixes
* Fix ENI stats probing
* Add trace for the last Tx cleanup call
* Prevent LLQ initialization if member isn't exposed
* Improve logging

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 79e1500276a993c8be857a6e32f0c05ec8f3cdc8)


  Commit: 3b65360a796edc68c264cf48d1892bdd432e8edc
      https://github.com/MidnightBSD/src/commit/3b65360a796edc68c264cf48d1892bdd432e8edc
  Author: Mark Johnston <markj at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c
    M sys/dev/ena/ena.h
    M sys/dev/ena/ena_datapath.c

  Log Message:
  -----------
  ena: Make first_interrupt a uint8_t

We do not have atomic(9) routines for bools, and it is not guaranteed
that sizeof(bool) is 1.

This fixes the KASAN and KMSAN kernel builds, which fail because the
compiler refuses to silently cast a _Bool * to a uint8_t * when calling
the atomic(9) sanitizer interceptors.

Reviewed by:	Dawid G?recki <dgr at semihalf.com>
MFC after:	2 weeks
Fixes:	0ac122c388d9 ("ena: Use atomic_load/store functions for first_interrupt variable")
Differential Revision:	https://reviews.freebsd.org/D35683

(cherry picked from commit b72f1f4516896ad6da0ea74d146a56045de171f7)


  Commit: be45a26b8292550626420f19d70c3ae86196c484
      https://github.com/MidnightBSD/src/commit/be45a26b8292550626420f19d70c3ae86196c484
  Author: Michal Krawczyk <mk at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena_datapath.c

  Log Message:
  -----------
  ena: Align req_id and qid print order

In most places, the req_id is printed first, and the qid is printed as a
second. To align the driver, one printout was reworked and the print
order of those variables was changed.

Suggested by: rpokala
Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 38d036e91a8c29bf97b86d441a9d627c5cef2aea)


  Commit: f16a5b469703d270721d31e2ab9388a35de9f9bd
      https://github.com/MidnightBSD/src/commit/f16a5b469703d270721d31e2ab9388a35de9f9bd
  Author: Michal Krawczyk <mk at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.c

  Log Message:
  -----------
  ena: Fix LLQ descriptor reconfiguration

After the device reset, the LLQ configuration descriptor wasn't passed
to the hardware. On a 6-generation AWS instances (like C6gn), it is
required to pass the LLQ descriptor after the device reset, otherwise
the hardware will be missing the LLQ configuration resulting in
performance degradation.

This patch reconfigures the LLQ each time the ena_device_init() is
called. This means that the LLQ descriptor will be passed during the
initial configuration and after a reset.

The ena_map_llq_mem_bar() function call was moved before the
ena_device_init() call, to make sure that the mem bar is available.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 3324e304c14d121dc04338a38c7f3277cbfba58b)


  Commit: 2f70993ef4abad840f2dd893d9206b3529349abc
      https://github.com/MidnightBSD/src/commit/2f70993ef4abad840f2dd893d9206b3529349abc
  Author: Michal Krawczyk <mk at semihalf.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/ena/ena.h

  Log Message:
  -----------
  ena: Update driver version to v2.6.1

Minor version update which improves styling of a printouts, fixes
the KASAN and KMSAN kernel builds and LLQ reconfiguration after the
device reset.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 25b64933a48c47baef698a302fa2dc5c6e3013ea)


  Commit: d8062723faa578203d377dadc299f4c0d13187b6
      https://github.com/MidnightBSD/src/commit/d8062723faa578203d377dadc299f4c0d13187b6
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/qat/qatvar.h

  Log Message:
  -----------
  qat(4): Fix a typo in a source code comment

- s/bufer/buffer/

Obtained from:	NetBSD

(cherry picked from commit 9fd95378f38390c76363e9884e25b37724b8a753)


  Commit: 22405587c93bf08e30c6b59dcc3b2d3b9d75c9dd
      https://github.com/MidnightBSD/src/commit/22405587c93bf08e30c6b59dcc3b2d3b9d75c9dd
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sbin/pfctl/pfctl_altq.c

  Log Message:
  -----------
  pfctl(8): Fix a typo in a source code comment

- s/bufer/buffer/

(cherry picked from commit a101b1b7f24aaabed03b73f2a4dd7acb41bb7a93)


  Commit: 15cb7bab29d88d2309e8ece749cc0a868759c09d
      https://github.com/MidnightBSD/src/commit/15cb7bab29d88d2309e8ece749cc0a868759c09d
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/rpc/svc_vc.c

  Log Message:
  -----------
  Adjust svc_vc_null() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/rpc/svc_vc.c:1078:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    svc_vc_null()
               ^
                void

This is because svc_vc_null() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 87d18efef7e3df5f4475cfe1a8f6d6782b7c1527)


  Commit: 0c95f9f006198f7d4ffc190c886c1f96f3fd6297
      https://github.com/MidnightBSD/src/commit/0c95f9f006198f7d4ffc190c886c1f96f3fd6297
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c

  Log Message:
  -----------
  Fix unused variable warning in mlx5_fs_tree.c

With clang 15, the following -Werror warning is produced:

    sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c:1408:15: error: variable 'candidate_group_num' set but not used [-Werror,-Wunused-but-set-variable]
            unsigned int candidate_group_num = 0;
                         ^

The 'candidate_group_num' variable appears to have been a debugging aid
that has never been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit 6332ad8673fb108dcb8af0aaa42d75ea845748d7)


  Commit: bcb75efeef0ca944d2c56c58c59d14f4d7e5f0be
      https://github.com/MidnightBSD/src/commit/bcb75efeef0ca944d2c56c58c59d14f4d7e5f0be
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/iscsi/icl_soft.c

  Log Message:
  -----------
  Fix unused variable warning in icl_soft.c

With clang 15, the following -Werror warning is produced:

    sys/dev/iscsi//icl_soft.c:886:6: error: variable 'coalesced' set but not used [-Werror,-Wunused-but-set-variable]
            int coalesced, error;
                ^

The 'coalesced' variable is eventually used only in an #if 0'd block,
obviously meant for debugging. Ensure that 'coalesced' is only declared
and used when DEBUG_COALESCED is defined, so the debugging can be easily
turned on later, if desired.

MFC after:	3 days

(cherry picked from commit f4f847018048ac7699b55bc1915a393eb65e4c53)


  Commit: 6de56698d1c20631d759e4784d2bed9f4465d983
      https://github.com/MidnightBSD/src/commit/6de56698d1c20631d759e4784d2bed9f4465d983
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/rpc/auth_none.c

  Log Message:
  -----------
  Adjust authnone_create() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/rpc/auth_none.c:106:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    authnone_create()
                   ^
                    void

This is because authnone_create() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 90529847cf079d3b7250ae3d3ecd79e843df7973)


  Commit: 2456de835630a91597cfbd08ea5f9071d68b9a4d
      https://github.com/MidnightBSD/src/commit/2456de835630a91597cfbd08ea5f9071d68b9a4d
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/mthca/mthca_cmd.c

  Log Message:
  -----------
  Fix unused variable warning in mlx5_ib_devx.c

With clang 15, the following -Werror warning is produced:

    sys/dev/mthca/mthca_cmd.c:662:23: error: variable 'tc' set but not used [-Werror,-Wunused-but-set-variable]
            int ts __unused = 0, tc = 0;
                                 ^

The 'ts' and 'tc' variables are eventually used only in mthca_dbg()
macros, if CONFIG_INFINIBAND_MTHCA_DEBUG is defined. Ensure 'ts' and
'tc' are only declared and used when CONFIG_INFINIBAND_MTHCA_DEBUG is
defined.

MFC after:	3 days

(cherry picked from commit 5ae3710aeb2a984344fbe36de71612fc1a3d1a71)


  Commit: f8d705d9db883756e91133a0413927e3c882995b
      https://github.com/MidnightBSD/src/commit/f8d705d9db883756e91133a0413927e3c882995b
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/compat/linux/linux_util.c

  Log Message:
  -----------
  Adjust linux_get_char_devices() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/compat/linux/linux_util.c:243:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    linux_get_char_devices()
                          ^
                           void

This is because linux_get_char_devices() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit e90d1b57487759e076b16cd3903a7b69565452b9)


  Commit: b414fd0223612d10afcc2e67bb118df167a83c53
      https://github.com/MidnightBSD/src/commit/b414fd0223612d10afcc2e67bb118df167a83c53
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/rpc/rpcb_clnt.c

  Log Message:
  -----------
  Adjust local_rpcb() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/rpc/rpcb_clnt.c:439:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    local_rpcb()
              ^
               void

This is because local_rpcb() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit e87d90a9dce22003d79ae895bac5ce2d0ca029fe)


  Commit: f607f1cdddcbc3980b4ae29f5bd4caf4455163a6
      https://github.com/MidnightBSD/src/commit/f607f1cdddcbc3980b4ae29f5bd4caf4455163a6
  Author: Eugene Grosbein <eugen at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/find/find.1

  Log Message:
  -----------
  find.1: explain why "find -s" may differ from "find | sort"

In short, that's because a directory name may end
with a character that goes before slash (/).

(cherry picked from commit 26a329f49fb4537d598e93f16054fd9e16f7e677)


  Commit: d0cecf4226062c8b03448f1e971ddcd024313f0c
      https://github.com/MidnightBSD/src/commit/d0cecf4226062c8b03448f1e971ddcd024313f0c
  Author: Eugene Grosbein <eugen at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/find/find.1

  Log Message:
  -----------
  find.1: small language fix after previous change

collate -> collation

(cherry picked from commit d6054ee652a56466277f87bb4bcb757105393c8c)


  Commit: 3aa3cb558f292aafc5cf6314bdfe2f4ff468c653
      https://github.com/MidnightBSD/src/commit/3aa3cb558f292aafc5cf6314bdfe2f4ff468c653
  Author: Eugene Grosbein <eugen at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sbin/ifconfig/ifconfig.8

  Log Message:
  -----------
  ifconfig.8: cleanup reminiscence about long gone ppp(4)

Replace ppp(4) removed since FreeBSD 8.0-RELEASE with vlan(4).
While here, remove commented out reference to non-existing "egress"
interface group hiding since initial import of interface groups
from OpenBSD in 2006.

(cherry picked from commit 3c9ad9398fcdf5f49114fde978b7c837b7ebbc8d)


  Commit: 7d3e31adb14e06283e57068a9f5b33533ae750a2
      https://github.com/MidnightBSD/src/commit/7d3e31adb14e06283e57068a9f5b33533ae750a2
  Author: Eugene Grosbein <eugen at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M libexec/ftpd/Makefile
    M libexec/ftpd/Makefile.depend

  Log Message:
  -----------
  ftpd(8): do not refer to now unused libxo(3)

In 2018, the commit r328100 (0fdf7fa846b1a1b1679e86812a1b08b8cb623604)
removed libxo(3) support from ls(1), so ftpd has no reasons to link
with libxo since then.

(cherry picked from commit 796d48ec416863ab2826a1205365710635244023)


  Commit: 4e07ae6e5ad5a563bed7758cfef5ccaf31172c03
      https://github.com/MidnightBSD/src/commit/4e07ae6e5ad5a563bed7758cfef5ccaf31172c03
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/sctp_timer.c

  Log Message:
  -----------
  Fix unused variable warning in sctp_timer.c

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_timer.c:510:6: error: variable 'recovery_cnt' set but not used [-Werror,-Wunused-but-set-variable]
            int recovery_cnt = 0;
                ^

The 'recovery_cnt' variable is only used when INVARIANTS is undefined.
Ensure it is only declared and set in that case.

MFC after:	3 days

(cherry picked from commit 5bfd8cf3691381c19296d76d7944d6c1df5f4a75)


  Commit: d06f5a775e76b97ce210f80adfb835080b54b0eb
      https://github.com/MidnightBSD/src/commit/d06f5a775e76b97ce210f80adfb835080b54b0eb
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/pf/if_pfsync.c

  Log Message:
  -----------
  Fix unused variable warning in if_pfsync.c

With clang 15, the following -Werror warning is produced:

    sys/netpfil/pf/if_pfsync.c:2153:9: error: variable 'sent' set but not used [-Werror,-Wunused-but-set-variable]
            int i, sent = 0;
                   ^

The 'sent' variable was used in the for loop later in the
pfsync_bulk_update() function, but refactoring in 4fc65bcbe3fb7 got rid
of it. Remove the variable since it no longer serves any purpose.

MFC after:	3 days

(cherry picked from commit fb48e998501f8d1defecffb772121a4141cdc2b6)


  Commit: e293191b0b14d6aefe537e6185f019ee28dc2404
      https://github.com/MidnightBSD/src/commit/e293191b0b14d6aefe537e6185f019ee28dc2404
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/pf/pf.c

  Log Message:
  -----------
  Adjust function definitions in pf.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/pf/pf.c:985:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_mtag_initialize()
                      ^
                       void
    sys/netpfil/pf/pf.c:995:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_initialize()
                 ^
                  void
    sys/netpfil/pf/pf.c:1089:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_mtag_cleanup()
                   ^
                    void
    sys/netpfil/pf/pf.c:1096:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_cleanup()
              ^
               void
    sys/netpfil/pf/pf.c:1989:27: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_purge_expired_src_nodes()
                              ^
                               void
    sys/netpfil/pf/pf.c:2174:24: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_purge_unlinked_rules()
                           ^
                            void

This is because pf_mtag_initialize(), pf_initialize(),
pf_mtag_cleanup(), pf_cleanup(), pf_purge_expired_src_nodes(), and
pf_purge_unlinked_rules() are declared with (void) argument lists, but
defined with empty argument lists. Make the definitions match the
declarations.

MFC after:	3 days

(cherry picked from commit 503b5870c018ec342be1396896560b720945d7e5)


  Commit: a8f7bcd727969611e1a3172102fd6ad652ddbbb5
      https://github.com/MidnightBSD/src/commit/a8f7bcd727969611e1a3172102fd6ad652ddbbb5
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/sctp_output.c

  Log Message:
  -----------
  Fix unused variable warning in sctp_output.c

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_output.c:9367:33: error: variable 'cnt_thru' set but not used [-Werror,-Wunused-but-set-variable]
            int no_fragmentflg, bundle_at, cnt_thru;
                                           ^

The 'cnt_thru' variable was in sctp_output.c when it was first added,
but appears to have been a debugging aid that has never been used, so
remove it.

MFC after:	3 days

(cherry picked from commit 9057feddc4b05d2b2b29e4db274c28af3d574d76)


  Commit: dbe753d74adf93a879178b437928663f2072f3a4
      https://github.com/MidnightBSD/src/commit/dbe753d74adf93a879178b437928663f2072f3a4
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/sctp_indata.c

  Log Message:
  -----------
  Fix unused variable warnings in sctp_indata.c

With clang 15, the following -Werror warnings are produced:

    sys/netinet/sctp_indata.c:3309:6: error: variable 'tot_retrans' set but not used [-Werror,-Wunused-but-set-variable]
            int tot_retrans = 0;
                ^
    sys/netinet/sctp_indata.c:3842:20: error: variable 'resend' set but not used [-Werror,-Wunused-but-set-variable]
            int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                              ^
    sys/netinet/sctp_indata.c:3842:47: error: variable 'acked' set but not used [-Werror,-Wunused-but-set-variable]
            int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                                                         ^
    sys/netinet/sctp_indata.c:3842:58: error: variable 'above' set but not used [-Werror,-Wunused-but-set-variable]
            int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                                                                    ^

The 'tot_retrans' variable was used in sctp_strike_gap_ack_chunks(), but
refactoring in 493d8e5a830e got rid of it. Remove the variable since it
no longer serves any purpose.

The 'resend', 'acked', and 'above' variables are only used when
INVARIANTS is undefined. Ensure they are only declared and set in that
case.

MFC after:	3 days

(cherry picked from commit 05b3a4282c408f495add570bbca12242dd006279)


  Commit: eb12279aecb76b0f28437ed73c73dcf7013bd808
      https://github.com/MidnightBSD/src/commit/eb12279aecb76b0f28437ed73c73dcf7013bd808
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/pf/if_pfsync.c

  Log Message:
  -----------
  Adjust function definitions in if_pfsync.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/pf/if_pfsync.c:2439:21: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_pointers_init()
                        ^
                         void
    sys/netpfil/pf/if_pfsync.c:2453:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_pointers_uninit()
                          ^
                           void
    sys/netpfil/pf/if_pfsync.c:2503:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_init()
               ^
                void
    sys/netpfil/pf/if_pfsync.c:2524:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_uninit()
                 ^
                  void

This is because pfsync_pointers_init(), pfsync_pointers_uninit(),
pfsync_init(), and pfsync_uninit() are declared with (void) argument
lists, but defined with empty argument lists. Make the definitions match
the declarations.

MFC after:	3 days

(cherry picked from commit 766f3c8032a95f344823bea70bb7f794f9939d33)


  Commit: 987083130a610bd8b6a7a53ee959c4424006e2bc
      https://github.com/MidnightBSD/src/commit/987083130a610bd8b6a7a53ee959c4424006e2bc
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/sctp_sysctl.c

  Log Message:
  -----------
  Adjust sctp_init_sysctls() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_sysctl.c:55:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    sctp_init_sysctls()
                     ^
                      void

This is because sctp_init_sysctls() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 205798564926589ed621b88d1853429d00de6de0)


  Commit: 3b071cdd94d4548c49a0a1e026e009679222b56e
      https://github.com/MidnightBSD/src/commit/3b071cdd94d4548c49a0a1e026e009679222b56e
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netgraph/ng_base.c

  Log Message:
  -----------
  Adjust ng_{name,ID}_rehash() definitions to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/netgraph/ng_base.c:981:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ng_name_rehash()
                  ^
                   void
    sys/netgraph/ng_base.c:1012:13: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ng_ID_rehash()
                ^
                 void

This is because ng_name_rehash() and ng_ID_rehash() are declared with
(void) argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit dba7f4aa0909d8c31a0ca0ad0d1208fabfaa9352)


  Commit: feffc083ae59332712ae725f12d1140533ecb4c5
      https://github.com/MidnightBSD/src/commit/feffc083ae59332712ae725f12d1140533ecb4c5
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/kern_dtrace.c

  Log Message:
  -----------
  Adjust function definitions in kern_dtrace.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/kern_dtrace.c:64:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    kdtrace_proc_size()
                     ^
                      void
    sys/kern/kern_dtrace.c:87:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    kdtrace_thread_size()
                       ^
                        void

This is because kdtrace_proc_size() and kdtrace_thread_size() are
declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit db8ea61ae261cc060f423dea050bf943bcad6793)


  Commit: 5f953be73190cf9988a518cead1b16f2eb9fdbbd
      https://github.com/MidnightBSD/src/commit/5f953be73190cf9988a518cead1b16f2eb9fdbbd
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/geom/geom_event.c

  Log Message:
  -----------
  Adjust function definitions in geom_event.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/geom/geom_event.c:261:13: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_run_events()
                ^
                 void
    sys/geom/geom_event.c:405:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_do_wither()
               ^
                void
    sys/geom/geom_event.c:449:13: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_event_init()
                ^
                 void

This is because g_run_events(), g_do_wither(), and g_event_init() are
declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit ac3153434fcc3ddcbb47c7f397a1bc34fd0e0dcb)


  Commit: c82a4c25930d97cce4dc8ea5b94769fe69f65802
      https://github.com/MidnightBSD/src/commit/c82a4c25930d97cce4dc8ea5b94769fe69f65802
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/sctp_pcb.c

  Log Message:
  -----------
  Adjust sctp_drain() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_pcb.c:6946:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    sctp_drain()
              ^
               void

This is because sctp_drain() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 24e13a49faabb22ece97dc8e4718caf8f6bad84c)


  Commit: 06c5975427101a646a8aefb81e2b4c0ab507ce85
      https://github.com/MidnightBSD/src/commit/06c5975427101a646a8aefb81e2b4c0ab507ce85
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/xen/blkback/blkback.c

  Log Message:
  -----------
  Fix unused variable warning in xen's blkback.c

With clang 15, the following -Werror warning is produced:

    sys/dev/xen/blkback/blkback.c:1561:12: error: variable 'req_seg_idx' set but not used [-Werror,-Wunused-but-set-variable]
                    u_int                    req_seg_idx;
                                             ^

The 'req_seg_idx' variable was used in the for loop later in the
xbb_dispatch_io() function, but refactoring in 112cacaee408 got rid of
it. Remove the variable since it no longer serves any purpose.

MFC after:	3 days

(cherry picked from commit 39e12a7591bf2ed4b2fae48e19f3af3a3cdcb196)


  Commit: 0440ca911e2621746424152f0422a24624ae4421
      https://github.com/MidnightBSD/src/commit/0440ca911e2621746424152f0422a24624ae4421
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/acpica/acpi_timer.c

  Log Message:
  -----------
  Adjust function definition in acpi_timer.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/dev/acpica/acpi_timer.c:402:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    acpi_timer_test()
                   ^
                    void

This is because acpi_timer_test() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit c45bc02560b0f632f8e085679512a588bfcb3384)


  Commit: 535e26c567e57eb0f77545ae84a14952f4a6f87e
      https://github.com/MidnightBSD/src/commit/535e26c567e57eb0f77545ae84a14952f4a6f87e
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/kern_resource.c

  Log Message:
  -----------
  Adjust function definitions in kern_resource.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/kern_resource.c:1212:10: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    lim_alloc()
             ^
              void
    sys/kern/kern_resource.c:1365:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    uihashinit()
              ^
               void

This is because lim_alloc() and uihashinit() are declared with (void)
argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit f2eb09b089bcdf546ed3fd4c2c59d9df02c585d8)


  Commit: a967f983809dd373a347a7e2c7fa7a304b6a705f
      https://github.com/MidnightBSD/src/commit/a967f983809dd373a347a7e2c7fa7a304b6a705f
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet6/nd6.c

  Log Message:
  -----------
  Adjust function definition in nd6.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/netinet6/nd6.c:247:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    nd6_destroy()
               ^
                void

This is nd6_destroy() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 50207b2de9a53491c2b5ee9b96689333f5c46de5)


  Commit: 670a42cb6a8ce357e1770f145a44440df551559a
      https://github.com/MidnightBSD/src/commit/670a42cb6a8ce357e1770f145a44440df551559a
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/vfs_bio.c

  Log Message:
  -----------
  Adjust function definition in vfs_bio.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/kern/vfs_bio.c:3430:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    buf_daemon()
              ^
               void

This is because buf_daemon() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit a387bd1b6a0e18d7abafcbb5ae1870be0604ff15)


  Commit: deae27529c66be25121120497069b977153ea328
      https://github.com/MidnightBSD/src/commit/deae27529c66be25121120497069b977153ea328
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/sysv_msg.c

  Log Message:
  -----------
  Adjust function definitions in sysv_msg.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/sysv_msg.c:213:8: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    msginit()
           ^
            void
    sys/kern/sysv_msg.c:316:10: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    msgunload()
             ^
              void

This is because msginit() and msgunload() are declared with (void)
argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 78cfed2de70d023acb452c06dbd1ffd8341f4608)


  Commit: 3ea2a6a49a2127fecb684b1a5cb97948d40eba70
      https://github.com/MidnightBSD/src/commit/3ea2a6a49a2127fecb684b1a5cb97948d40eba70
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/subr_autoconf.c

  Log Message:
  -----------
  Adjust function definition in subr_autoconf.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/kern/subr_autoconf.c:119:34: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    run_interrupt_driven_config_hooks()
                                     ^
                                      void

This is because run_interrupt_driven_config_hooks() is declared with a
(void) argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 3c8f0790dd038ce646f140b7aad23b4e698c0522)


  Commit: 02557c3b04c02023d4d6627c0667faaa82d1095b
      https://github.com/MidnightBSD/src/commit/02557c3b04c02023d4d6627c0667faaa82d1095b
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/net80211/ieee80211_proto.c

  Log Message:
  -----------
  Fix unused variable warning in ieee80211_proto.c

With clang 15, the following -Werror warning is produced:

    sys/net80211/ieee80211_proto.c:1070:34: error: variable 'num_mixed' set but not used [-Werror,-Wunused-but-set-variable]
            int num_vaps = 0, num_pure = 0, num_mixed = 0;
                                            ^

The 'num_mixed' variable was in ieee80211_proto.c when the function
vap_update_ht_protmode() was added, but it was never used for anything,
so remove it.

MFC after:	3 days

(cherry picked from commit 9319211f96c6f11959c76f1d565a744ab37b0031)


  Commit: 05663a079ca2dad9b1fe50b2f8e02e5725cbc872
      https://github.com/MidnightBSD/src/commit/05663a079ca2dad9b1fe50b2f8e02e5725cbc872
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/ufs/ufs/ufs_dirhash.c

  Log Message:
  -----------
  Adjust function definition in ufs_dirhash.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/ufs/ufs/ufs_dirhash.c:1252:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ufsdirhash_lowmem()
                     ^
                      void

This is ufsdirhash_lowmem() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 08c16dd4bf6ee5649a86fa472104f89b3fbfe71a)


  Commit: bc18d902de24f2f73395ace876f2953fd2ff1af5
      https://github.com/MidnightBSD/src/commit/bc18d902de24f2f73395ace876f2953fd2ff1af5
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/conf/kern.mk
    M sys/modules/zlib/Makefile

  Log Message:
  -----------
  Suppress -Wstrict-prototypes for several zlib files

Clang 15 is more strict about function definitions not matching
declarations, and zlib has a lot of these, but since it is contributed
code (and in K&R style to boot), suppress those warnings instead.

MFC after:	3 days

(cherry picked from commit e83ffec3af2e71cc64348d58481c87db9efbac92)


  Commit: 0c146f0f08413a6f56416f94826159e9d2ac31ca
      https://github.com/MidnightBSD/src/commit/0c146f0f08413a6f56416f94826159e9d2ac31ca
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/ufs/ffs/ffs_snapshot.c

  Log Message:
  -----------
  Fix unused variable warning in ffs_snapshot.c

With clang 15, the following -Werror warning is produced:

    sys/ufs/ffs/ffs_snapshot.c:204:7: error: variable 'redo' set but not used [-Werror,-Wunused-but-set-variable]
            long redo = 0, snaplistsize = 0;
                 ^

The 'redo' variable is only used when DIAGNOSTIC is defined. Ensure it
is only declared and set in that case.

MFC after:	3 days

(cherry picked from commit c9dde6f0c713a027266c52cf94a33a086348c566)


  Commit: e8db09bf112d7a32c841a239c51b246ffae610a6
      https://github.com/MidnightBSD/src/commit/e8db09bf112d7a32c841a239c51b246ffae610a6
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/speaker/spkr.c

  Log Message:
  -----------
  Adjust playinit() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/speaker/spkr.c:182:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    playinit()
            ^
             void

This is because playinit() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 57c46916e145581807333bc06a08e9532721bd8f)


  Commit: eba23f0bcaf59eaf11f6437ccf04e0cb3e9af93e
      https://github.com/MidnightBSD/src/commit/eba23f0bcaf59eaf11f6437ccf04e0cb3e9af93e
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/amd64/amd64/pmap.c

  Log Message:
  -----------
  Fix unused variable warning in amd64's pmap.c

With clang 15, the following -Werror warning is produced:

    sys/amd64/amd64/pmap.c:8274:22: error: variable 'freed' set but not used [-Werror,-Wunused-but-set-variable]
            int allfree, field, freed, i, idx;
                                ^

The 'freed' variable is only used when PV_STATS is defined. Ensure it is
only declared and set in that case.

MFC after:	3 days

(cherry picked from commit 7a1f289bd2949e5867c7f0396c35f02f179dc8bd)


  Commit: c86c1a632b37694036613b4ea6194ea6d3bf7ac4
      https://github.com/MidnightBSD/src/commit/c86c1a632b37694036613b4ea6194ea6d3bf7ac4
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/kern_cons.c

  Log Message:
  -----------
  Adjust function definitions in kern_cons.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/kern_cons.c:201:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cninit_finish()
                 ^
                  void
    sys/kern/kern_cons.c:376:7: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cngrab()
          ^
           void
    sys/kern/kern_cons.c:389:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cnungrab()
            ^
             void
    sys/kern/kern_cons.c:402:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cnresume()
            ^
             void

This is because cninit_finish(), cngrab(), cnungrab(), and cnresume()
are declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 9806e82a23924f32dc5976bc8687fbbe293a140b)


  Commit: 33272e82a5760148528bf8d3186bc770336662dc
      https://github.com/MidnightBSD/src/commit/33272e82a5760148528bf8d3186bc770336662dc
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/sfxge/common/efsys.h

  Log Message:
  -----------
  Fix unused variable warning in sfxge's ef10_tx.c

With clang 15, the following -Werror warning is produced:

    sys/dev/sfxge/common/ef10_tx.c:345:15: error: variable 'eqp' set but not used [-Werror,-Wunused-but-set-variable]
            efx_qword_t *eqp;
                         ^

The 'eqp' variable is passed as an argument to the EFSYS_BAR_WC_WRITEQ()
macro, but currently this macro ignores the argument, similar to its
other _esbp argument. Silence the warning by casting the _eqp argument
to void in the macro.

MFC after:	3 days

(cherry picked from commit a79731b9453320af6fcf5ec16fa5de900dadbce8)


  Commit: d613f60686be337bae486cfba2408c9cf4012f3d
      https://github.com/MidnightBSD/src/commit/d613f60686be337bae486cfba2408c9cf4012f3d
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/ufs/ufs/ufs_dirhash.c

  Log Message:
  -----------
  Adjust function definitions in ufs_dirhash.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/ufs/ufs/ufs_dirhash.c:1303:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ufsdirhash_init()
                   ^
                    void
    sys/ufs/ufs/ufs_dirhash.c:1319:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ufsdirhash_uninit()
                     ^
                      void

This is because ufsdirhash_init() and ufsdirhash_uninit() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit ed1d5f95a599635e2af4a78ce96bfcdf8a3b7a47)


  Commit: b1d76d74b5e1923873e6d5db2cb362bb3e9392fc
      https://github.com/MidnightBSD/src/commit/b1d76d74b5e1923873e6d5db2cb362bb3e9392fc
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/geom/geom_io.c

  Log Message:
  -----------
  Adjust function definition in geom_io.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/geom/geom_io.c:272:10: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_io_init()
             ^
              void

This is because g_io_init() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 165a32121cc775719b55dc0f8b66259b0fbf8325)


  Commit: 582032e3cbd7482c076af221b678eebb996acb20
      https://github.com/MidnightBSD/src/commit/582032e3cbd7482c076af221b678eebb996acb20
  Author: John Baldwin <jhb at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/usb/input/atp.c

  Log Message:
  -----------
  atp: Remove unused variable.

(cherry picked from commit 197b9a2ef0037e02721fec27a707e34a4d06d2c6)


  Commit: 0e647288d6ebf1517da3cd11614001692494db81
      https://github.com/MidnightBSD/src/commit/0e647288d6ebf1517da3cd11614001692494db81
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/usb/input/atp.c

  Log Message:
  -----------
  Fix unused variable warning in usb's atp.c

With clang 15, the following -Werror warning is produced:

    sys/dev/usb/input/atp.c:2018:11: error: variable 'n_vertical_scrolls' set but not used [-Werror,-Wunused-but-set-variable]
            u_int8_t n_vertical_scrolls = 0;
                     ^

The 'n_vertical_scrolls' variable is no longer used after 197b9a2ef003,
so remove it.

MFC after:	3 days

(cherry picked from commit b621f3cf2d2c30880c49afe37598e0f550afb181)


  Commit: b28beb3387231c7ede582087e812e5ea08eaac96
      https://github.com/MidnightBSD/src/commit/b28beb3387231c7ede582087e812e5ea08eaac96
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netipsec/key.c

  Log Message:
  -----------
  Adjust function definitions in netipsec's key.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/netipsec/key.c:6432:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    key_getcomb_ah()
                  ^
                   void
    sys/netipsec/key.c:6489:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    key_getcomb_ipcomp()
                      ^
                       void

This is because key_getcomb_ah() and key_getcomb_ipcomp() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 8bd2887be5105010e73fc35ddd25021e186811b8)


  Commit: 9cafde90f55531854c0c6d6dcbe4a9e3f5a270b7
      https://github.com/MidnightBSD/src/commit/9cafde90f55531854c0c6d6dcbe4a9e3f5a270b7
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netipsec/key_debug.c

  Log Message:
  -----------
  Fix unused variable warning in netipsec's key_debug.c

With clang 15, the following -Werror warning is produced:

    sys/netipsec/key_debug.c:923:9: error: variable 'j' set but not used [-Werror,-Wunused-but-set-variable]
            int i, j;
                   ^

The 'j' variable was in key_debug.c when it was first added, but it
appears to have been a debugging aid that has never been used, so remove
it.

MFC after:	3 days

(cherry picked from commit c01fdd7a9f316c8c04786441ca0113be002b96be)


  Commit: 8b895e151b07524eaba1f07b2b60b43d01e70cd4
      https://github.com/MidnightBSD/src/commit/8b895e151b07524eaba1f07b2b60b43d01e70cd4
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/smartpqi/smartpqi_helper.c

  Log Message:
  -----------
  Adjust check_struct_sizes() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/smartpqi/smartpqi_helper.c:374:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    check_struct_sizes()
                      ^
                       void

This is because check_struct_sizes() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit fb1c21688c5702d0bc50d67359dee4af12d0c693)


  Commit: 426cb3eda4d28e93c6c8cd626c245b16eef252a2
      https://github.com/MidnightBSD/src/commit/426cb3eda4d28e93c6c8cd626c245b16eef252a2
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/geom/geom_subr.c

  Log Message:
  -----------
  Adjust function definition in geom_subr.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/geom/geom_subr.c:484:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_wither_washer()
                   ^
                    void

This is because g_wither_washer() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit bfa9298765167bde0eacc538cc5a5bae4cdd7ed3)


  Commit: b0f9a1a01067f40aa6ff9d8f9eee2fbf155ea841
      https://github.com/MidnightBSD/src/commit/b0f9a1a01067f40aa6ff9d8f9eee2fbf155ea841
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/xen/blkfront/blkfront.c

  Log Message:
  -----------
  Fix unused variable warning in xen's blkfront.c

With clang 15, the following -Werror warning is produced:

    sys/dev/xen/blkfront/blkfront.c:602:6: error: variable 'sbp' set but not used [-Werror,-Wunused-but-set-variable]
            int sbp;
                ^

The 'sbp' variable was used in the for loop later in the xb_dump()
function, but refactoring in e4808c4b2dba got rid of it. Remove the
variable since it no longer serves any purpose.

MFC after:      3 days

(cherry picked from commit e635220e1a330560ee547069054d81c4cf0b7839)


  Commit: eea80ded7011ea91c39d6b6bc1d19485ad3b603e
      https://github.com/MidnightBSD/src/commit/eea80ded7011ea91c39d6b6bc1d19485ad3b603e
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/xen/control/control.c

  Log Message:
  -----------
  Adjust function definitions in xen's control.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/dev/xen/control/control.c:188:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    xctrl_poweroff()
                  ^
                   void
    sys/dev/xen/control/control.c:194:13: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    xctrl_reboot()
                ^
                 void
    sys/dev/xen/control/control.c:207:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    xctrl_suspend()
                 ^
                  void
    sys/dev/xen/control/control.c:344:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    xctrl_crash()
               ^
                void

This is because xctrl_poweroff(), xctrl_reboot(), xctrl_suspend(), and
xctrl_crash() are declared with (void) argument lists, but defined with
empty argument lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit a6c803048fd8d4209fb1d52cd3c455a6752109b7)


  Commit: 3b464a5153ef80c70e89c77ef3b59c29c6ec1e09
      https://github.com/MidnightBSD/src/commit/3b464a5153ef80c70e89c77ef3b59c29c6ec1e09
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/ufs/ffs/ffs_snapshot.c

  Log Message:
  -----------
  Revert "Fix unused variable warning in ffs_snapshot.c"

This reverts commit 6ef6d3424f158a797d280ebd3103d4d833d41230.

The ffs_snapshot.c code in stable/12 is pretty far behind, and merging
all the additional changesets needed is too much churn.


  Commit: 759a3573910a418006320da700d706d702134a75
      https://github.com/MidnightBSD/src/commit/759a3573910a418006320da700d706d702134a75
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/isa/pnp.c

  Log Message:
  -----------
  Adjust function definition in isa's pnp.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/isa/pnp.c:118:24: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pnp_send_initiation_key()
                           ^
                            void

This is because pnp_send_initiation_key() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 24e8823ef579b99b32c00a7a126a78f91727498a)


  Commit: 3cad37d50474b99dfb6fde63099bfc91cd06bf92
      https://github.com/MidnightBSD/src/commit/3cad37d50474b99dfb6fde63099bfc91cd06bf92
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/modules/iscsi/Makefile

  Log Message:
  -----------
  Remove unnecessary terminating slash in iscsi module Makefile

The additional slash causes double slashes in the filenames that
eventually get passed to the compiler.

MFC after:	3 days

(cherry picked from commit dfddfe29d85c5c60b30db3c9dec32e4d8270bd49)


  Commit: 80981f57c521fb651e00ac575214969451ae189f
      https://github.com/MidnightBSD/src/commit/80981f57c521fb651e00ac575214969451ae189f
  Author: Mateusz Guzik <mjg at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/pf/pf.c

  Log Message:
  -----------
  pf: add pf_bcmp_state_key

Reviewed by:	kp
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D33131

(cherry picked from commit b6c8c7b99a750de18509715890615ad3f948b29a)


  Commit: 95e00432eb5b42cf9ebce00bced3ade8089975f7
      https://github.com/MidnightBSD/src/commit/95e00432eb5b42cf9ebce00bced3ade8089975f7
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/bluetooth/bthidd/server.c

  Log Message:
  -----------
  bluetooth(3): Fix a typo in a source code comment

- s/intrrupt/interrupt/

(cherry picked from commit e24fd6d664091dbdf35e5fa77f276613b2e21691)


  Commit: 40091bcf80f6a6e53a0ba8538803dc6ff2638fb5
      https://github.com/MidnightBSD/src/commit/40091bcf80f6a6e53a0ba8538803dc6ff2638fb5
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/cxgb/common/cxgb_common.h

  Log Message:
  -----------
  cxgb(4): Fix a typo in a source code comment

- s/collissions/collisions/

Obtained from:	NetBSD

(cherry picked from commit 6c73ba1a280b1992cdd8d30910f1f99c4b65d87a)


  Commit: 2a2201502db09ee2134a803d7d6f05914d6d4c2c
      https://github.com/MidnightBSD/src/commit/2a2201502db09ee2134a803d7d6f05914d6d4c2c
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/qlnx/qlnxe/ecore_int.c

  Log Message:
  -----------
  qlnxe(4): Fix a typo in a source code comment

- s/pedning/pending/

(cherry picked from commit 37519e3ff390ae0c648513156aef7f1fe31bf4d2)


  Commit: ca2c31f9fbe276597278d0f828d2e6eeb2beebf5
      https://github.com/MidnightBSD/src/commit/ca2c31f9fbe276597278d0f828d2e6eeb2beebf5
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/mfi/mfireg.h

  Log Message:
  -----------
  uefi(8): Fix a typo in a source code comment

- s/intrrupt/interrupt/

(cherry picked from commit 98b610b506781fe04e2bedccce9069db0b7a563e)


  Commit: 8c76ec5f8b2ba291139a466e437b5dec86c253dd
      https://github.com/MidnightBSD/src/commit/8c76ec5f8b2ba291139a466e437b5dec86c253dd
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/uhsoctl/uhsoctl.1

  Log Message:
  -----------
  uhsoctl.1: Fix the man page date

- STYLE: normalizing date format to: August 12, 2009

(cherry picked from commit 2bf1b9984f0786335571c697185c822d6960cf04)


  Commit: 1899c48deaf8fdb341c33abbe5db97a3310369ac
      https://github.com/MidnightBSD/src/commit/1899c48deaf8fdb341c33abbe5db97a3310369ac
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/find/find.1

  Log Message:
  -----------
  find.1: Fix mandoc warnings and mention a useful manpage

- new sentence, new line
- unknown AT&T UNIX version: At v7
- no blank before trailing delimiter
- reference the ASCII(8) manual page

(cherry picked from commit 321dc6ee7e81e1b06db725f218db08a8aca47d31)


  Commit: 45abc75ca8ee96e94bd26a266b605ea93fc244c0
      https://github.com/MidnightBSD/src/commit/45abc75ca8ee96e94bd26a266b605ea93fc244c0
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/find/find.1

  Log Message:
  -----------
  find.1: Correct the markup

- ASCII is an acronym and there is no ascii(8) manual page
- Reference ascii(7) in the SEE ALSO section

Reported by:	karels
X-MFC with:	321dc6ee7e81

(cherry picked from commit 93b8510c3697d56630066dd61c7bbd466e617bd1)


  Commit: 0634fa9336951f3597c75b9878404f2db1f79625
      https://github.com/MidnightBSD/src/commit/0634fa9336951f3597c75b9878404f2db1f79625
  Author: David Sips <dsips at netapp.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/net/if_vlan.c

  Log Message:
  -----------
  if_vlan: avoid hash table thrashing when adding and removing entries

vlan_remhash() uses incorrect value for b.

When using the default value for VLAN_DEF_HWIDTH (4), the VLAN hash-list table
expands from 16 chains to 32 chains as the 129th entry is added. trunk->hwidth
becomes 5. Say a few more entries are added and there are now 135 entries.
trunk-hwidth will still be 5. If an entry is removed, vlan_remhash() will
calculate a value of 32 for b. refcnt will be decremented to 134. The if
comparison at line 473 will return true and vlan_growhash() will be called. The
VLAN hash-list table will be compressed from 32 chains wide to 16 chains wide.
hwidth will become 4. This is an error, and it can be seen when a new VLAN is
added. The table will again be expanded. If an entry is then removed, again
the table is contracted.

If the number of VLANS stays in the range of 128-512, each time an insert
follows a remove, the table will expand. Each time a remove follows an
insert, the table will be contracted.

The fix is simple. The line 473 should test that the number of entries has
decreased such that the table should be contracted using what would be the new
value of hwidth. line 467 should be:

	b = 1 << (trunk->hwidth - 1);

PR:		265382
Reviewed by:	kp
MFC after:	2 weeks
Sponsored by:	NetApp, Inc.

(cherry picked from commit 151abc80cde778bc18b91c334d07fbd52bbb38fb)


  Commit: 0e249bc5ad5af3b93fd0e2f836a3bd63440eebbd
      https://github.com/MidnightBSD/src/commit/0e249bc5ad5af3b93fd0e2f836a3bd63440eebbd
  Author: Steve Kargl <kargl at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M lib/msun/src/s_cbrt.c
    M lib/msun/src/s_cbrtl.c

  Log Message:
  -----------
  [libm] Correct comments in s_cbrt[l].c

Damian McGuckin <damianm at esi dot com dot au> noted that the accuracy
claims in the code for cbrt(3) and cbrtl(3) were incorrect. Fix the
comments to more accurately describe the accuracies.

PR:		265603
MFC after:	3 days

(cherry picked from commit 369ea0520a3061c07400d7cd32172efb6af39815)


  Commit: 4964f0c0dfc7352e9db5cf636471e4fcfda50cee
      https://github.com/MidnightBSD/src/commit/4964f0c0dfc7352e9db5cf636471e4fcfda50cee
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/bce/if_bce.c

  Log Message:
  -----------
  bce(4): Fix two typos in kernel messages

- s/bufferred/buffered/

(cherry picked from commit 1ffd352bc25bb74eb4026c271dea1410e0098fb3)


  Commit: b70bf3f1c386ecd568b155fde3afa197400322df
      https://github.com/MidnightBSD/src/commit/b70bf3f1c386ecd568b155fde3afa197400322df
  Author: Elliott Mitchell <ehem_freebsd at m5p.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/misc/bsd-family-tree

  Log Message:
  -----------
  bsd-family-tree: Update various URLs in file

Been some time since 364fe18b8c8 when the URL was first in this file.
Update from svnweb to cgit for the URL listed at the end of this file.
In addition, update all URLs to HTTPS. Replace two URLs with links to
archive.org as the original URLs are no longer valid.

Reviewed by:		imp
Differential Revision:	https://reviews.freebsd.org/D34730

(cherry picked from commit 2b68a79b73d7a5b9ed43ad199413705f5935f01c)


  Commit: b8d260042eeee52df25b0ba244b612f78d99a2ed
      https://github.com/MidnightBSD/src/commit/b8d260042eeee52df25b0ba244b612f78d99a2ed
  Author: Mark Johnston <markj at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/vm/vm_fault.c

  Log Message:
  -----------
  vm_fault: Shoot down shared mappings in vm_fault_copy_entry()

As in vm_fault_cow(), it's possible, albeit rare, for multiple vm_maps
to share a shadow object.  When copying a page from a backing object
into the shadow, all mappings of the source page must therefore be
removed.  Otherwise, future operations on the object tree may detect
that the source page is fully shadowed and thus can be freed.

Approved by:	so
Security:	FreeBSD-SA-22:11.vm
Reviewed by:	alc, kib
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D35635

(cherry picked from commit 5c50e900ad779fccbf0a230bfb6a68a3e93ccf60)


  Commit: 2ef0862ddc9104b7a272973e70a03c1288965758
      https://github.com/MidnightBSD/src/commit/2ef0862ddc9104b7a272973e70a03c1288965758
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/vnode_if.src

  Log Message:
  -----------
  vnode(9): Fix a typo in a source code comment

- s/paramater/parameter/

(cherry picked from commit fa1ac9693a6d9253edb139358f79cacdd45bc10a)


  Commit: 905bcb1dea69c5d2fe71f096f1b7b04208206e55
      https://github.com/MidnightBSD/src/commit/905bcb1dea69c5d2fe71f096f1b7b04208206e55
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/net80211/ieee80211_proto.c

  Log Message:
  -----------
  net80211(4): Fix a typo in a source code comment

- s/paramaters/parameters/

(cherry picked from commit 044169efe0b7f8a3c30f33ae081054def91acc7d)


  Commit: dd736a59dd601e41ace172737504383481a9306f
      https://github.com/MidnightBSD/src/commit/dd736a59dd601e41ace172737504383481a9306f
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/isci/scil/sati_util.c

  Log Message:
  -----------
  isci(4): Fix a typo in a source code comment

- s/paramater/parameter/

(cherry picked from commit 0702f4f0409e39d6b85b0b008a4e4cdf9690beb9)


  Commit: 9370288de1e87da1643799253cd192a1943f0329
      https://github.com/MidnightBSD/src/commit/9370288de1e87da1643799253cd192a1943f0329
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/mfiutil/mfiutil.8

  Log Message:
  -----------
  mfiutil.8: Fix some mandoc warnings

- new sentence, new line
- no blank before trailing delimiter

(cherry picked from commit 75f8dcc831bf80c7efc93d3461699f95033c1d28)


  Commit: d12c20344d90283ce6e81e6585583aee2ed85987
      https://github.com/MidnightBSD/src/commit/d12c20344d90283ce6e81e6585583aee2ed85987
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M lib/libpathconv/abs2rel.3
    M lib/libpathconv/rel2abs.3

  Log Message:
  -----------
  libpathconv: Fix mandoc warnings in abs2rel(3) and rel2abs(3)

- cannot parse date, using it verbatim: Dec 15, 1997"
- sections out of conventional order: Sh SEE ALSO
- possible typo in section name: Sh EXAMPLE instead of EXAMPLES
- AUTHORS section without An macro

(cherry picked from commit 094517119c62c23369d545a7475ae982d86330a3)


  Commit: 516ccf4433aa18251439f68a369dba9590662b41
      https://github.com/MidnightBSD/src/commit/516ccf4433aa18251439f68a369dba9590662b41
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M lib/libpathconv/abs2rel.3
    M lib/libpathconv/rel2abs.3

  Log Message:
  -----------
  libpathconv: bump man page dates

- bump the man page dates to the date of mandoc fixes

Reported by:	rpokala
X-MFC with:	094517119c62c23369d545a7475ae982d86330a3

(cherry picked from commit 948168c778e872552da7b3ef22a6d55df1215ed2)


  Commit: eda1efe58ed303974dcb167cd63fca873e524662
      https://github.com/MidnightBSD/src/commit/eda1efe58ed303974dcb167cd63fca873e524662
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M lib/libutil/login_tty.3

  Log Message:
  -----------
  libutil: Fix mandoc warnings

- missing comma before name
- possible typo in section name: Sh CAVEAT instead of CAVEATS
- useless macro: Tn
- blank line in fill mode, using .sp
- no blank before trailing delimiter: Dv NULL?

(cherry picked from commit 816ca3d10fd2f0c9283005a189fac156071d748d)


  Commit: 1413320621be2dd15edab59ad08c7a3d1809b859
      https://github.com/MidnightBSD/src/commit/1413320621be2dd15edab59ad08c7a3d1809b859
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/nullfs/null_vnops.c

  Log Message:
  -----------
  nullfs(5): Fix a typo in a source code comment

- s/examing/examining/

(cherry picked from commit 4c399b044fc66b02e37110ca5c1f4ce0e3beb9d1)


  Commit: bd41a1afa1b368079bc232e21c90f75b6de61c0d
      https://github.com/MidnightBSD/src/commit/bd41a1afa1b368079bc232e21c90f75b6de61c0d
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet6/nd6.c

  Log Message:
  -----------
  inet6(4): Fix a typo in a source code comment

- s/Unreachablity/Unreachability/

(cherry picked from commit cd33039749356f613013ebf02795cafc0aba1968)


  Commit: e0085c09dfc73a6ba6e56bda3163e4218ab65d46
      https://github.com/MidnightBSD/src/commit/e0085c09dfc73a6ba6e56bda3163e4218ab65d46
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: Split init code into sub function

Be clear of what we enable or init.

No functional changes intended

(cherry picked from commit 158ce7ba0ed04fc65f6f09381ab924f10b7e96a0)


  Commit: 4500eabffb5a5221f60b2e3fd51deaf35846ddda
      https://github.com/MidnightBSD/src/commit/4500eabffb5a5221f60b2e3fd51deaf35846ddda
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: Use if_setdrvflagbits to notify that we are running

No functional changes intended

(cherry picked from commit b0cc649b95d8721612973ef05f48fc9622b98beb)


  Commit: 7460d5f81a189d56aa556b001546b620b43500a6
      https://github.com/MidnightBSD/src/commit/7460d5f81a189d56aa556b001546b620b43500a6
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: Add a function to enable/disable the mac tx/rx

No functional changes intended

(cherry picked from commit f368f4b10924cb530e5ab2ada38bb2b08e193ea8)


  Commit: 27ae816359bd35fea96f322474068046e7bfdc10
      https://github.com/MidnightBSD/src/commit/27ae816359bd35fea96f322474068046e7bfdc10
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: Use dwc_enable_mac in dwc_stop_locked

No functional changes intended

(cherry picked from commit 86c7bc68ed20446600c5cc98f53c75cd90468a5a)


  Commit: 39af6e61c5b69f30d702214dd77b2e599155ba54
      https://github.com/MidnightBSD/src/commit/39af6e61c5b69f30d702214dd77b2e599155ba54
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: Add dwc_stop_dma and use it in dwc_stop_locked

No functional changes intended

(cherry picked from commit afd0c3c26801cd038203da1df61be9728e3369a4)


  Commit: 10112aacf199653695eef44cf337018bbcbc2934
      https://github.com/MidnightBSD/src/commit/10112aacf199653695eef44cf337018bbcbc2934
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: dwc_get_hwaddr cannot fail, change return to void

No functional changes intended

(cherry picked from commit f88e0af64abb8317c67fa075125b1943a7f42997)


  Commit: 1fca23dd3bd5137ecf37b6fbb541fffb303db785
      https://github.com/MidnightBSD/src/commit/1fca23dd3bd5137ecf37b6fbb541fffb303db785
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: Reorder functions and sort them by usage

No functional changes intended

(cherry picked from commit 2a35d39179c20ff0822446f20dee70ffd1122dc7)


  Commit: 128cd3641c67a20d489239894827198bd91049bf
      https://github.com/MidnightBSD/src/commit/128cd3641c67a20d489239894827198bd91049bf
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: Use if_ function where appropriate

No functional changes intended

(cherry picked from commit 3bbd11ee511a5256fe3bb525980207b75e41bab9)


  Commit: c0053ddf6203894076d48028367736559f540b21
      https://github.com/MidnightBSD/src/commit/c0053ddf6203894076d48028367736559f540b21
  Author: Mitchell Horne <mhorne at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/arm/allwinner/aw_if_dwc.c

  Log Message:
  -----------
  if_dwc: recognize additional rgmii phy-modes

Per the reports, some Allwinner device trees now list the desired
phy-mode as "rgmii-id". The manual string comparison fails to detect
this, and we end up falling back to MII mode. Instead, select the clock
name using the sc->phy_mode variable, which is set in the main attach
function.

The logic to actually handle rgmii-id mode delays will be added to the
relevant PHY driver.

PR:		261355, 264673
Reported by:	Maren <marentoy at protonmail.com>
Reported by:	Arie Bikker <src-2016 at bikker.homeunix.net>
Reviewed by:	manu
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D35500

(cherry picked from commit 3428997cb398767655a5651b76eb177a56e4b00a)


  Commit: ab6a0df84db465d190120ba60b510f236fefc7f5
      https://github.com/MidnightBSD/src/commit/ab6a0df84db465d190120ba60b510f236fefc7f5
  Author: Mitchell Horne <mhorne at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  if_dwc: avoid duplicate packet counts

We already increment the unicast IPACKETS and OPACKETS counters in the
rx/tx paths, respectively. Multicast packets are counted in the generic
ethernet code. Therefore, we shouldn't increment these counters in
dwc_harvest_stats().

Drop the early return from dwc_rxfinish_one() so that we still count
received packets with e.g. a checksum error.

PR:		263817
Reported by:	Jiahao LI <jiahali at blackberry.com>
Reviewed by:	manu
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D35499

(cherry picked from commit 9718759043ec2ef36f12b15963194b866d731b5b)


  Commit: 2a499a165cef133e892e71f8aee44f7e1e6193d4
      https://github.com/MidnightBSD/src/commit/2a499a165cef133e892e71f8aee44f7e1e6193d4
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c

  Log Message:
  -----------
  dwc: Use mii_fdt function

Use the helper function to get phy mode and configure dwc accordingly.

Reviewed by:	ian

(cherry picked from commit f77d8d10115b0863cc3dfd6e1746c02847d6569d)


  Commit: f398e2e1d6151ec9037e1bdfeb697357992e14b0
      https://github.com/MidnightBSD/src/commit/f398e2e1d6151ec9037e1bdfeb697357992e14b0
  Author: Emmanuel Vadot <manu at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/dwc/if_dwc.c
    M sys/dev/dwc/if_dwc.h

  Log Message:
  -----------
  dwc: Support phy mode MII

Some board use dwc phy in MII mode, so do not fail to attach if this is
the case.
Only rockchip code uses the phy mode to program some custom syscon register.

PR:	260848
MFC after:	1 week
Sponsored by:	Beckhoff Automation GmbH & Co. KG

(cherry picked from commit da6252a6a099e6253207b69960e6762ce3cca0f8)


  Commit: 55f747e62705c5e00705921e44c583c81ca67a89
      https://github.com/MidnightBSD/src/commit/55f747e62705c5e00705921e44c583c81ca67a89
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/dict/web2

  Log Message:
  -----------
  Add "heard" to the dictionary

PR:		265671
Reported by:	J.R. Oldroyd
MFC after:	3 days

(cherry picked from commit 711ee0591832857c4484dbc05f0d8e03e9c760e4)


  Commit: cad5d8a6354750e2dad99c763c1c350b913e837e
      https://github.com/MidnightBSD/src/commit/cad5d8a6354750e2dad99c763c1c350b913e837e
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M Makefile.inc1

  Log Message:
  -----------
  installworld: improve portability of ldd use

b3b462229f97 added a case statement to ignore lines containing strings
in square brackets such as "[vdso]" and "[preloaded]". On MacOS
Monterey where /bin/sh may be zsh, this fails with:

/bin/sh: -c: line 0: syntax error near unexpected token `;;'

Invoke grep in the pipeline to remove such lines instead.

Reviewed by:	emaste
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D35618

(cherry picked from commit bda5d2a45c8dcc9bbeb71cddeef930ffa6a47f23)


  Commit: 080379c6b486cbc2d3e2a2ac7e0b8bea1caf845d
      https://github.com/MidnightBSD/src/commit/080379c6b486cbc2d3e2a2ac7e0b8bea1caf845d
  Author: Cy Schubert <cy at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M libexec/rc/rc.d/wpa_supplicant

  Log Message:
  -----------
  rc.d/wpa_supplicant: Remove the sleep to improve boot time

bapt@ had discovered a noticeable boot improvement without the sleep.
Without the sleep does not affect warm or cold boot however a
service netif restart may cause dhclient to spend a few extra seconds
to rerequest the DHCP request.

Reported by:	bapt
Reviewed by:	bapt
Differential Revision:	https://reviews.freebsd.org/D35457

(cherry picked from commit 116679b39cb94fdb94c02dceb1c2cae719bd3f42)


  Commit: 546d3e617c9050a5687dbafd7f5b30d773722a1c
      https://github.com/MidnightBSD/src/commit/546d3e617c9050a5687dbafd7f5b30d773722a1c
  Author: Xin LI <delphij at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.bin/minigzip/minigzip.1

  Log Message:
  -----------
  Deprecate minigzip(1) in preparation of removing it from base system.

Reviewed by:	emaste, pauamma
Differential Revision: https://reviews.freebsd.org/D36000

(cherry picked from commit 0404b8c88fd857aae9ecf73ab9e1b1c2a8fd7ae1)


  Commit: 320573fe301738283d131819aaaa177068cb409a
      https://github.com/MidnightBSD/src/commit/320573fe301738283d131819aaaa177068cb409a
  Author: James Skon <jps at rgnets.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/net/altq/altq_hfsc.c

  Log Message:
  -----------
  altq: improve pfctl config time for large numbers of queues

In the current implementation of altq_hfsc.c, whne new queues are being
added (by pfctl), each queue is added to the tail of the siblings linked
list under the parent queue.

On a system with many queues (50,000+) this leads to very long load
times at the insertion process must scan the entire list for every new
queue,

Since this list is unordered, this changes merely adds the new queue to
the head of the list rather than the tail.

Reviewed by:	kp
MFC after:	3 weeks
Sponsored by:	RG Nets
Differential Revision:	https://reviews.freebsd.org/D35964

(cherry picked from commit 13890d30f8b215b84800cce3f161ad5148c82c00)


  Commit: 8b6a0fee2eecf584a08d929a15f5a0b251b82840
      https://github.com/MidnightBSD/src/commit/8b6a0fee2eecf584a08d929a15f5a0b251b82840
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man4/unix.4

  Log Message:
  -----------
  [skip ci] unix(4): LOCAL_PEERCRED works on SOCK_SEQPACKET, too.

Reviewed By:	dchagin
Differential Revision: https://reviews.freebsd.org/D31456

(cherry picked from commit 518e697f2accf3769dc986e254a4c79db7ec5a06)


  Commit: 3d2893968299068829a78788445460abc3c29f70
      https://github.com/MidnightBSD/src/commit/3d2893968299068829a78788445460abc3c29f70
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M tools/test/upsdl/upsdl.c

  Log Message:
  -----------
  tools/test/upsdl: fix compiler warnings

Sponsored by:	Axcient

(cherry picked from commit 5dc5f849be9047309d32c4df8e7ee617c27ec43f)


  Commit: 1dab311dbf606b7252e95daa643baf4340221d31
      https://github.com/MidnightBSD/src/commit/1dab311dbf606b7252e95daa643baf4340221d31
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/fuse/fuse_vnops.c
    M tests/sys/fs/fusefs/rename.cc

  Log Message:
  -----------
  fusefs: fix a cached attributes bug during directory rename

When renaming a directory into a different parent directory, invalidate
the cached attributes of the new parent.  Otherwise, stat will show the
wrong st_nlink value.

Reviewed by:	ngie
Differential Revision: https://reviews.freebsd.org/D34336

(cherry picked from commit e8553be9bcfc2c0d78e9f379bd166dc0a9cae719)


  Commit: 547b470afcc001d013e37b4dfeb6dec5fffb1bd4
      https://github.com/MidnightBSD/src/commit/547b470afcc001d013e37b4dfeb6dec5fffb1bd4
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/fuse/fuse_vnops.c
    M tests/sys/fs/fusefs/destroy.cc
    M tests/sys/fs/fusefs/dev_fuse_poll.cc
    M tests/sys/fs/fusefs/forget.cc
    M tests/sys/fs/fusefs/lookup.cc

  Log Message:
  -----------
  fusefs: fix two bugs regarding VOP_RECLAIM of the root inode

* We never send FUSE_LOOKUP for the root inode, since its inode number
  is hard-coded to 1.  Therefore, we should not send FUSE_FORGET for it,
  lest the server see its lookup count fall below 0.

* During VOP_RECLAIM, if we are reclaiming the root inode, we must clear
  the file system's vroot pointer.  Otherwise it will be left pointing
  at a reclaimed vnode, which will cause future VOP_LOOKUP operations to
  fail.  Previously we only cleared that pointer during VFS_UMOUNT.  I
  don't know of any real-world way to trigger this bug.

Reviewed by:	pfg
Differential Revision: https://reviews.freebsd.org/D34753

(cherry picked from commit 32273253667b941c376cf08383006b3a0cbc5ca2)


  Commit: b995994dedc570bd32a36cb0d3d65730c80da5c9
      https://github.com/MidnightBSD/src/commit/b995994dedc570bd32a36cb0d3d65730c80da5c9
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/fuse/fuse_device.c
    M tests/sys/fs/fusefs/lookup.cc
    M tests/sys/fs/fusefs/mockfs.cc
    M tests/sys/fs/fusefs/mockfs.hh
    M tests/sys/fs/fusefs/utils.cc

  Log Message:
  -----------
  fusefs: validate servers' error values

Formerly fusefs would pass up the stack any error value returned by the
fuse server.  However, some values aren't valid for userland, but have
special meanings within the kernel.  One of these, EJUSTRETURN, could
cause a kernel page fault if the server returned it in response to
FUSE_LOOKUP.  Fix by validating all errors returned by the server.

Also, fix a data lifetime bug in the FUSE_DESTROY test.

PR:		263220
Reported by:	Robert Morris <rtm at lcs.mit.edu>
Sponsored by:	Axcient
Reviewed by:	emaste
Differential Revision: https://reviews.freebsd.org/D34931

(cherry picked from commit 155ac516c60f20573d15c54bafabfd0e52d21fa6)


  Commit: 00050b28c0fa5fa89f42ebc076a4e12037748d2b
      https://github.com/MidnightBSD/src/commit/00050b28c0fa5fa89f42ebc076a4e12037748d2b
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/fuse/fuse_io.c
    M tests/sys/fs/fusefs/write.cc

  Log Message:
  -----------
  fusefs: correctly handle servers that report too much data written

During a FUSE_WRITE, the kernel requests the server to write a certain
amount of data, and the server responds with the amount that it actually
did write.  It is obviously an error for the server to write more than
it was provided, and we always treated it as such, but there were two
problems:

* If the server responded with a huge amount, greater than INT_MAX, it
  would trigger an integer overflow which would cause a panic.

* When extending the file, we wrongly set the file's size before
  validing the amount written.

PR:		263263
Reported by:	Robert Morris <rtm at lcs.mit.edu>
Sponsored by:	Axcient
Reviewed by:	emaste
Differential Revision: https://reviews.freebsd.org/D34955

(cherry picked from commit 3a1b3c6a1e68063330e897a5a5c94518edae4a3b)


  Commit: 281b2f42bde8ca2bab3c8c5d8d40b6eb36f36063
      https://github.com/MidnightBSD/src/commit/281b2f42bde8ca2bab3c8c5d8d40b6eb36f36063
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/tcp_log_buf.c
    M usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c

  Log Message:
  -----------
  prometheus_sysctl_exporter: fix metric aliasing

When exporting sysctls to Prometheus, the exporter replaces "." with
"_".  This caused several metrics to alias, confusing the Prometheus
server.  Fix it by:

* Renaming the "tcp_log_bucket" UMA zone to "tcp_log_id_bucket".  Also,
  rename "tcp_log_node" to "tcp_log_id_node" for consistency.

* Not exporting sysctls with "(LEGACY)" in the description.  That is
  used by ZFS sysctls that have been replaced by others, many of which
  alias to the same Prometheus metric name (like "vfs.zfs.arc_max" and
  "vfs.zfs.arc.max").

PR:		259607
Reported by:	delphij
Sponsored by:	Axcient
Reviewed by:	delphij,rew,thj
Differential Revision: https://reviews.freebsd.org/D34952

(cherry picked from commit 8c47d8f53854825d8e8591ccd06e32b2c798f81c)


  Commit: 5e38ca44afe277e763c9b7148f799b69275ecc58
      https://github.com/MidnightBSD/src/commit/5e38ca44afe277e763c9b7148f799b69275ecc58
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/fuse/fuse_vnops.c
    M tests/sys/fs/fusefs/create.cc

  Log Message:
  -----------
  fusefs: fix FUSE_CREATE with file handles and fuse protocol < 7.9

Prior to fuse protocol version 7.9, the fuse_entry_out structure had a
smaller size.  But fuse_vnop_create did not take that into account when
working with servers that use older protocols.  The bug does not matter
for servers which don't use file handles or open flags (the only fields
affected).

PR:		263625
Submitted by:	Ali Abdallah <ali.abdallah at suse.com>

(cherry picked from commit 45825a12f9851213e627cf41398706bacb793f83)


  Commit: 39f8d76907cfe994c34c2a78d5e7352736b5d247
      https://github.com/MidnightBSD/src/commit/39f8d76907cfe994c34c2a78d5e7352736b5d247
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/fuse/fuse_internal.c

  Log Message:
  -----------
  fusefs: fix an undefined variable access

In an error path, a dtrace probe could access an undefined variable.

Reported by:	Coverity (CID 1471986)
Sponsored by:	Axcient

(cherry picked from commit dcfa054216ef8dfebed9c7c06c066bce0098bd94)


  Commit: cc607dca3849ac41e7c076a8657ed601d5f1d9b1
      https://github.com/MidnightBSD/src/commit/cc607dca3849ac41e7c076a8657ed601d5f1d9b1
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/sys/time.h
    M tests/sys/sys/Makefile
    A tests/sys/sys/time_test.c

  Log Message:
  -----------
  fix integer overflow bugs in *stosbt

68f57679d660 Fixed another class of integer overflows, but introduced a
boundary condition for 2-4s in ns conversion, 2-~4000s in us conversions
and 2-~4,000,000s in ms conversions. This was because we bogusly used
SBT_1S for the notion of 1 second, instead of the appropriate power of
10. To fix, just use the appropriate power of 10, which avoids these
overflows.

This caused some sleeps in ZFS to be on the order of an hour.

MFC:			1 day
PR:			263073
Sponsored by:		Netflix
Reviewed by:		asomers
Differential Revision:	https://reviews.freebsd.org/D34790

Fix overflow errors in sbttous and sbttoms

Both of these functions would overflow for very large inputs.  Add tests
for them.  Also, add tests for the inverse functions, *stosbt, whose
overflow errors were fixed by 4c30b9ecd47.

PR:		263073
Sponsored by:	Axcient
Reviewed by:	imp
Differential Revision: https://reviews.freebsd.org/D34809

(cherry picked from commit 4c30b9ecd47a2d92565731082a6a4f2bd1e6e051)
(cherry picked from commit 10f44229dcd93672583ad6b6e1193a9bc9e4f7c7)


  Commit: e3f1c843963383ffcc5b75c4d67d6a4d3c7e3e54
      https://github.com/MidnightBSD/src/commit/e3f1c843963383ffcc5b75c4d67d6a4d3c7e3e54
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/fuse/fuse_ipc.h
    M sys/fs/fuse/fuse_node.c
    M sys/fs/fuse/fuse_vnops.c
    M tests/sys/fs/fusefs/create.cc
    M tests/sys/fs/fusefs/link.cc
    M tests/sys/fs/fusefs/lookup.cc
    M tests/sys/fs/fusefs/mkdir.cc
    M tests/sys/fs/fusefs/mknod.cc
    M tests/sys/fs/fusefs/symlink.cc

  Log Message:
  -----------
  fusefs: make the mknod.cc tests a bit more general.

Reviewed by:    pfg

(cherry picked from commit 8b582b16402102df10a715c626e212bbbc8e9d7c)

fusefs: handle evil servers that return illegal inode numbers

* If during FUSE_CREATE, FUSE_MKDIR, etc the server returns the same
  inode number for the new file as for its parent directory, reject it.
  Previously this would triggers a recurse-on-non-recursive lock panic.

* If during FUSE_LINK the server returns a different inode number for
  the new name as for the old one, reject it.  Obviously, that can't be
  a hard link.

* If during FUSE_LOOKUP the server returns the same inode number for the
  new file as for its parent directory, reject it.  Nothing good can
  come of this.

PR:		263662
Reported by:	Robert Morris <rtm at lcs.mit.edu>
Reviewed by:	pfg
Differential Revision: https://reviews.freebsd.org/D35128

(cherry picked from commit 0bef4927ea858bb18b6f679bc0a36cff264dc842)


  Commit: 3f07c642b7cac53edca3d8ee5a240d0bd37858ee
      https://github.com/MidnightBSD/src/commit/3f07c642b7cac53edca3d8ee5a240d0bd37858ee
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cam/scsi/scsi_pass.c
    M sys/geom/geom_dev.c

  Log Message:
  -----------
  ses: don't panic if disk elements have really weird descriptors

SES allows element descriptors to contain characters like spaces and
quotes that devfs does not allow to appear in device aliases.  Since SES
element descriptors are outside of the kernel's control, we should
gracefully handle a failure to create a device physical path alias.

PR:		264513
Reported by:	Yuri <yuri at aetern.org>
Reviewed by:	imp, mav
Sponsored by:	Axcient

(cherry picked from commit 5f438dd3acba47e54e63b13bfff31a49bcc6ddea)


  Commit: 84e5f9294269739256f0078dceb339a549ee85e9
      https://github.com/MidnightBSD/src/commit/84e5f9294269739256f0078dceb339a549ee85e9
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c

  Log Message:
  -----------
  prometheus_sysctl_exporter: ignore ENOENT for mibs specified on the CLI

They might belong to kernel modules not currently loaded, or to other
kernel versions.  Ignoring them allows the configuration to be shared
between multiple hosts.

Sponsored by:	Axcient
Reviewed by:	rew
Differential Revision: https://reviews.freebsd.org/D35540

(cherry picked from commit 982f980b86d6bab4d55452d17bf3f5eb04e5f01e)


  Commit: 927f0590e4adab753b39cfb1b18c363fd45d27ec
      https://github.com/MidnightBSD/src/commit/927f0590e4adab753b39cfb1b18c363fd45d27ec
  Author: Alan Somers <asomers at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man4/ip6.4

  Log Message:
  -----------
  ip6(4): document IP_ORIGDSTADDR

The option was originally added in r313524, but with incomplete
documentation.

Reviewed by:	karels, gbe (manpages)
Differential Revision: https://reviews.freebsd.org/D35890

(cherry picked from commit a043594c211fd36228f4d84273885da50bb7f59c)


  Commit: 5c4a8dc080f15395c50c1876c04fd09cb2db8101
      https://github.com/MidnightBSD/src/commit/5c4a8dc080f15395c50c1876c04fd09cb2db8101
  Author: Franco Fichtner <franco at opnsense.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sbin/pfctl/parse.y

  Log Message:
  -----------
  pfctl: fix FOM_ICMP/POM_STICKYADDRESS clash

	pass inet proto icmp icmp-type {unreach}
	pass route-to (if0 127.0.0.1/8) sticky-address inet

The wrong struct was being tested. The parser tries to prevent
"sticky-address sticky-address" syntax but was actually cross-rule
enforcing that ICMP filter cannot be before the use of "sticky-address"
in next rule.

MFC after:	2 weeks
Reviewed by:	kp
Differential Revision:	https://reviews.freebsd.org/D36050

(cherry picked from commit 1e73fbd8b28946cb1341b51292082864943f0a89)


  Commit: 5c2cd715dda2a610e702467593c0cf5c910fa8f1
      https://github.com/MidnightBSD/src/commit/5c2cd715dda2a610e702467593c0cf5c910fa8f1
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M lib/clang/llvm.build.mk

  Log Message:
  -----------
  Avoid using TARGET_ARCH in llvm.build.mk

Apparently the TARGET_ARCH macro is not supposed to be used outside of
the top-level Makefiles. Directly use MACHINE_ARCH instead.

Noticed by:	imp, jrtc27
MFC after:	1 week

(cherry picked from commit 8534e6be8110a8126268a38dc0557a2d15615ce9)


  Commit: 920f269d3bbf5ccf261f2ee898c62f8a4415db96
      https://github.com/MidnightBSD/src/commit/920f269d3bbf5ccf261f2ee898c62f8a4415db96
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/gpio/gpioc.c

  Log Message:
  -----------
  gpio: mark more INVARIANTS variables as __diagused

Mark another set of variables that are only used in INVARIANTS builds,
which otherwise result in set-but-not-used warnings.

Fixes:		7dc4d5118c02
MFC after:	3 days

(cherry picked from commit 6e62d9a5a56c0cb8d314998e163096a454c84620)


  Commit: 31a93937140b26ebd426570561bb0093f5534d19
      https://github.com/MidnightBSD/src/commit/31a93937140b26ebd426570561bb0093f5534d19
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/dtrace/riscv/dtrace_subr.c

  Log Message:
  -----------
  Adjust function definition in riscv's dtrace_subr.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/cddl/dev/dtrace/riscv/dtrace_subr.c:165:17: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtrace_gethrtime()
                    ^
                     void

This is because dtrace_gethrtime() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 0beb88a242afbf7923e97cf317640d0f29310ca1)


  Commit: 0a023dfce33cd7cbfc5bfc67fc9b360500c46f69
      https://github.com/MidnightBSD/src/commit/0a023dfce33cd7cbfc5bfc67fc9b360500c46f69
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/arm64/rockchip/rk_spi.c

  Log Message:
  -----------
  Fix unused variable warning in rockchip's rk_spi.c

With clang 15, the following -Werror warning is produced:

    sys/arm64/rockchip/rk_spi.c:229:6: error: variable 'cnt' set but not used [-Werror,-Wunused-but-set-variable]
            int cnt = 0;
                ^

The 'cnt' variable was in rk_spi.c when it was first added, but it
appears to have been a debugging aid that has never been used, so remove
it.

MFC after:	3 days

(cherry picked from commit 0fe8ab6851687dc7249e3c5b5df3d6723d1c3e7a)


  Commit: fc0b00c123ece0a2616401c13c1aed1fd4f80531
      https://github.com/MidnightBSD/src/commit/fc0b00c123ece0a2616401c13c1aed1fd4f80531
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/dtrace/arm/dtrace_subr.c

  Log Message:
  -----------
  Adjust function definition in arm's dtrace_subr.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/cddl/dev/dtrace/arm/dtrace_subr.c:174:17: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtrace_gethrtime()
                    ^
                     void

This is because dtrace_gethrtime() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 7357c2e5a6a7c74eaf5c6732723df375ef4188b5)


  Commit: 96b395f5eb2be03237a0c7dae4a5b928aac880d8
      https://github.com/MidnightBSD/src/commit/96b395f5eb2be03237a0c7dae4a5b928aac880d8
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/cddl/dev/dtrace/powerpc/dtrace_subr.c

  Log Message:
  -----------
  Adjust function definition in powerpc's dtrace_subr.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/cddl/dev/dtrace/powerpc/dtrace_subr.c:237:17: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtrace_gethrtime()
                    ^
                     void

This is because dtrace_gethrtime() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 7701f3015948f4ff25d4d26586c64847289325b2)


  Commit: f9883c5c2102376aeca6d3592cb4abbfe9b3851a
      https://github.com/MidnightBSD/src/commit/f9883c5c2102376aeca6d3592cb4abbfe9b3851a
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/drm2/drm_fb_helper.c

  Log Message:
  -----------
  Adjust function definition in drm_fb_helper.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/drm2/drm_fb_helper.c:86:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    framebuffer_alloc()
                     ^
                      void

This is because framebuffer_alloc() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 7a7bbe10216e0fbcf3af7a122d249cb000d517c7)


  Commit: 1c8d02aa23f81949df7342fe60e70cf4a3670d87
      https://github.com/MidnightBSD/src/commit/1c8d02aa23f81949df7342fe60e70cf4a3670d87
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/kern_poll.c

  Log Message:
  -----------
  Adjust function definition in kern_poll.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/kern/kern_poll.c:374:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    netisr_pollmore()
                   ^
                    void

This is because netisr_pollmore() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 9762d48b7f12f7085d3f6ad83b3ca5ebd226b697)


  Commit: 00cd0eb88d71d85d94fa6062ec0034688520b5d5
      https://github.com/MidnightBSD/src/commit/00cd0eb88d71d85d94fa6062ec0034688520b5d5
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/tcp_stacks/rack.c

  Log Message:
  -----------
  Suppress unused variable warning in tcp_stacks's rack.c

With clang 15, the following -Werror warning is produced:

    sys/netinet/tcp_stacks/rack.c:17405:12: error: variable 'outstanding' set but not used [-Werror,-Wunused-but-set-variable]
                    uint32_t outstanding;
                             ^

The 'outstanding' variable was used later in the rack_output() function,
but refactoring in 35c7bb340788f removed the usage. To avoid too much
code churn, mark the variable unused to supress the warning.

MFC after:	3 days

(cherry picked from commit 57cdd13d072e56bf68c7b3d3b446aaf01288e12b)


  Commit: e04857dcfb9b561baed311405b87079567d3885b
      https://github.com/MidnightBSD/src/commit/e04857dcfb9b561baed311405b87079567d3885b
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/arm/mv/mv_common.c

  Log Message:
  -----------
  Adjust function definition in arm's mv_common.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/arm/mv/mv_common.c:414:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    mv_check_soc_family()
                       ^
                        void

This is because mv_check_soc_family() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 402dbdd98acc7fa94d1d4cd01903e987d2409336)


  Commit: 479856a03875cc14469c088f61678db8047ee295
      https://github.com/MidnightBSD/src/commit/479856a03875cc14469c088f61678db8047ee295
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/arm64/arm64/db_trace.c

  Log Message:
  -----------
  Adjust function definition in arm64's db_trace.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/arm64/arm64/db_trace.c:53:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    db_md_list_watchpoints()
                          ^
                           void

This is because db_md_list_watchpoints() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 940740891516c31a993cb0d267bd19f2d07ede49)


  Commit: 237439f3146932c437601e04e495f9d9228c2a55
      https://github.com/MidnightBSD/src/commit/237439f3146932c437601e04e495f9d9228c2a55
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/powerpc/aim/aim_machdep.c

  Log Message:
  -----------
  Adjust function definition in aim_machdep.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/powerpc/aim/aim_machdep.c:750:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cpu_sleep()
                 ^
                  void

This is because cpu_sleep() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 06fce030e79ecce57365bc537e38ee0f25861d70)


  Commit: ace8d3a36355536849e2393c8ec7d156dc3c428c
      https://github.com/MidnightBSD/src/commit/ace8d3a36355536849e2393c8ec7d156dc3c428c
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netinet/tcp_hpts.c

  Log Message:
  -----------
  Fix unused variable warning in tcp_hpts.c

With clang 15, the following -Werror warning is produced:

    sys/netinet/tcp_hpts.c:1114:10: error: variable 'paced_cnt' set but not used [-Werror,-Wunused-but-set-variable]
            int32_t paced_cnt = 0;
                    ^

The 'paced_cnt' variable was in tcp_hpts.c when it was first added, but
it appears to have been a debugging aid that has never been used, so
remove it.

MFC after:	3 days

(cherry picked from commit b33bfe6e157429ad764e9a883a5e3a194a6d1f9f)


  Commit: d4cd1bc7ed5b50479a6d98791973fa3e99b3b9c7
      https://github.com/MidnightBSD/src/commit/d4cd1bc7ed5b50479a6d98791973fa3e99b3b9c7
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/powerpc/booke/mp_cpudep.c

  Log Message:
  -----------
  Adjust function definitions in mp_cpudep.c.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/powerpc/booke/mp_cpudep.c:54:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cpudep_ap_bootstrap()
                       ^
                        void
    sys/powerpc/booke/mp_cpudep.c:97:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cpudep_ap_setup()
                   ^
                    void

This is because cpudep_ap_bootstrap() and cpudep_ap_setup() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 02dd51c9bccedc2fc8d98c3892986232f6bacdab)


  Commit: 54cd6bd782c39b4187c5b5f87a75329f63c6073f
      https://github.com/MidnightBSD/src/commit/54cd6bd782c39b4187c5b5f87a75329f63c6073f
  Author: Dimitry Andric <dim at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/riscv/riscv/db_trace.c

  Log Message:
  -----------
  Adjust function definition in riscv's db_trace.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/riscv/riscv/db_trace.c:56:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    db_md_list_watchpoints()
                          ^
                           void

This is because db_md_list_watchpoints() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit da36b5d244419fdc137e0cce50bf021e8c46c822)


  Commit: 65363eb1522340064c0f96d7a076e544089c17d3
      https://github.com/MidnightBSD/src/commit/65363eb1522340064c0f96d7a076e544089c17d3
  Author: Franco Fichtner <franco at opnsense.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sbin/pfctl/pfctl_parser.c

  Log Message:
  -----------
  pf: stop resolving hosts as dns that use ":" modifier

When the interface does not exist avoid passing host with special pf
modifiers to DNS resolution as they come up empty anyway.

Reviewed by:	kp
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D35429

(cherry picked from commit 28b64169eace3477abbd50c18163d37c45cf273a)


  Commit: 7952b51a7cc98a7cdadc2899d747261ce8273fad
      https://github.com/MidnightBSD/src/commit/7952b51a7cc98a7cdadc2899d747261ce8273fad
  Author: John Baldwin <jhb at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/bhyve/pci_xhci.c

  Log Message:
  -----------
  bhyve xhci: Cache the value of MaxPStreams when initializing an endpoint.

This avoids type confusion where a malicious guest could rewrite the
MaxPStreams field in an endpoint context after the endpoint was
initialized causing the device model to interpret a guest provided
address (stored in ep_ringaddr of the "software" endpoint state) as a
bhyve host process address (ep_sctx_trbs).  It also prevents a malicious
guest from triggering overflows of ep_sctx_trbs[] by increasing the
number of streams after the endpoint has been initialized.

Rather than re-reading the MaxPStreams value out of the endpoint context
in guest memory on subsequent operations, cache the value in the software
endpoint state.  Possibly the device model should raise errors if the
value of MaxPStreams changes while an endpoint is running.  This approach
simply ignores any such changes by the guest.

PR:		264294, 264347
Reported by:	Robert Morris <rtm at lcs.mit.edu>
Reviewed by:	markj
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D36181

(cherry picked from commit e7439f6aeb235ba3a7e79818c56a63d066c80854)


  Commit: c45c1eb4fbe1af29f24d77c8235354bad1ce3e8d
      https://github.com/MidnightBSD/src/commit/c45c1eb4fbe1af29f24d77c8235354bad1ce3e8d
  Author: Robert Wing <rew at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/bhyve/pci_e82545.c

  Log Message:
  -----------
  bhyve: fix -Wunused-but-set-variable warning

Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D33306

(cherry picked from commit 2616ee608cd54e544259ee738cd8b8ff71334ced)


  Commit: 0eaddfa7dd49ea621ca26996663da4d0c8a1021f
      https://github.com/MidnightBSD/src/commit/0eaddfa7dd49ea621ca26996663da4d0c8a1021f
  Author: John Baldwin <jhb at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M usr.sbin/bhyve/pci_e82545.c

  Log Message:
  -----------
  bhyve e1000: Skip packets with a small header.

Certain operations such as checksum insertion and VLAN insertion
require the device model to rewrite the packet header.  The first step
in rewriting the packet header is to copy the existing packet header
from the source packet.  This copy is done by copying data from an
iovec array that corresponds to the S/G entries described by transmit
descriptors.  However, if the total packet length is smaller than the
headers that need to be copied as the initial template, this copy can
overflow the iovec array and use garbage values as the source pointer
to memcpy.  The PR used a single descriptor with a length of 0 in its
PoC.

To fix, track the total packet length and drop requests to transmit
packets whose payload is smaller than the required header length.

While here, fix another issue where the final descriptor could have an
invalid length (too short) that could underflow 'len' when stripping
the checksum.  Skip those requests instead, too.

PR:		264372
Reported by:	Robert Morris <rtm at lcs.mit.edu>
Reviewed by:	grehan, markj
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D36182

(cherry picked from commit fa46f3704b7618f9d9493c126df781faf59040a8)


  Commit: d275fcf75a7437c8df24f5c9e430e01e3819cd8d
      https://github.com/MidnightBSD/src/commit/d275fcf75a7437c8df24f5c9e430e01e3819cd8d
  Author: John Baldwin <jhb at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/amd64/vmm/io/ppt.c

  Log Message:
  -----------
  bhyve: Validate host PAs used to map passthrough BARs.

Reject attempts to map host physical address ranges that are not
subsets of a passthrough device's BAR into a guest.

Reviewed by:	markj, emaste
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D36238

(cherry picked from commit c94f30ea85b745a5137471876013f79689e0af03)


  Commit: 5be2341ebad97f9ae7c38e392051040cc49482c5
      https://github.com/MidnightBSD/src/commit/5be2341ebad97f9ae7c38e392051040cc49482c5
  Author: Hans Petter Selasky <hselasky at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/ofed/drivers/infiniband/core/ib_addr.c

  Log Message:
  -----------
  ibcore: Add support for RDMA/RoCE using VLAN(4) devices.

Classify VLAN devices as ethernet in rdma_copy_addr().
This fixes the following error message:

rdma_bind_addr: No such file or directory

Submitted by:	Piotr Kubaj <pkubaj at FreeBSD.org>
Differential Revision:	https://reviews.freebsd.org/D36120
Sponsored by:	NVIDIA Networking

(cherry picked from commit 57af517ac4e8f88339ad1ff778d3b7ac32827430)


  Commit: 0affaa6bbc059661dccc418309788753f97055f7
      https://github.com/MidnightBSD/src/commit/0affaa6bbc059661dccc418309788753f97055f7
  Author: Mark Johnston <markj at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/pf/pf_if.c

  Log Message:
  -----------
  pf: Make sure that pfi_update_status() always zeros counters

pfi_update_status() can return early if the status interface doesn't
exist.  But in this case pf_getstatus() was copying uninitialized stack
memory into the output nvlist.

Reported by:	Jenkins (KMSAN job)
Reviewed by:	kp
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D35659

(cherry picked from commit 333670372ffe2f1c562e1088a7779eb709006ba2)


  Commit: a975c697f3a1af46ec285dc332ea59641da9b7d8
      https://github.com/MidnightBSD/src/commit/a975c697f3a1af46ec285dc332ea59641da9b7d8
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/netpfil/pf/pf_if.c

  Log Message:
  -----------
  pf: Reduce diffs against OpenBSD in pf_if.c

Use memset instead of bzero, memcpy instead of bcopy, and add some
optional {}s.

Reviewed by:	kp
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D36267

(cherry picked from commit 6b598e263bebaf6664b64f80f029a6ebcfc2848d)


  Commit: 495405421b819f834dad439a959bfe7048d5d810
      https://github.com/MidnightBSD/src/commit/495405421b819f834dad439a959bfe7048d5d810
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/opencrypto/criov.c

  Log Message:
  -----------
  opencrypto: mark INVARIANTS variables as __diagused

Fixes INVARIANTS build with Clang 15, which previously failed due to
set-but-not-used variable warnings.

MFC after:	1 week
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 3471fcf3a42d2a7b221215bfc772a6d1a170a059)


  Commit: 09641346af4f330386135e78de63ff111a6dd2bc
      https://github.com/MidnightBSD/src/commit/09641346af4f330386135e78de63ff111a6dd2bc
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/acpica/acpi_pci_link.c

  Log Message:
  -----------
  acpi: mark INVARIANTS variables as __diagused

Fixes INVARIANTS build with Clang 15, which previously failed due to
set-but-not-used variable warnings.

Reviewed by:	jhb
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D36096

(cherry picked from commit 0fd8d3589a68838d62d47f240d7fb22ef0d4dbeb)
(cherry picked from commit 9f45a241fc0db78ec62fd8ac3e19bc80694523f9)


  Commit: 939f7fe66d0a71af277e035b1fd6e8c4804b3f95
      https://github.com/MidnightBSD/src/commit/939f7fe66d0a71af277e035b1fd6e8c4804b3f95
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/gpio/gpioc.c

  Log Message:
  -----------
  gpio: mark INVARIANTS variables as __diagused

Fixes INVARIANTS build with Clang 15, which previously failed due to
set-but-not-used variable warnings.

Reviewed by:	dim
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D36097

(cherry picked from commit 7dc4d5118c0268efe48c0e36c49cba1e2a8e39fc)
(cherry picked from commit ff6ab85fc95a18da4d87d56afd82b484652ec3f6)


  Commit: 068471d25c742bbcc97ba223676dac83eca45897
      https://github.com/MidnightBSD/src/commit/068471d25c742bbcc97ba223676dac83eca45897
  Author: Gordon Bergling <gbe at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c

  Log Message:
  -----------
  bhnd(4): Correct a typo in a source code comment

- s/in he/in the/

(cherry picked from commit ce99e4fa4442ed7d1a7802612557b23173dd5781)


  Commit: 4d13487ae0eefe2b6d365b5b3316e8872e0ec512
      https://github.com/MidnightBSD/src/commit/4d13487ae0eefe2b6d365b5b3316e8872e0ec512
  Author: firk <firk at cantconnect.ru>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/kern_umtx.c

  Log Message:
  -----------
  Fix compat10 semaphore interface race

PR:	265997

(cherry picked from commit 768f6373eb3d60e346d3bfa495e04315aeed8ff9)


  Commit: 9f9bac2d148d1987f6506dea5b5fae5b490f17f8
      https://github.com/MidnightBSD/src/commit/9f9bac2d148d1987f6506dea5b5fae5b490f17f8
  Author: Brooks Davis <brooks at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M lib/libprocstat/libprocstat.h

  Log Message:
  -----------
  libprocstat: forward declare struct kinfo_proc

This allows libprocstat.h to be included without sys/user.h as
documented in the manpage.

PR:		266146

(cherry picked from commit a28f83353243e2298b5f89c0dd6705dfcbda77ea)


  Commit: 4ac39c2c776a69be90f19141dd44222fe972dccc
      https://github.com/MidnightBSD/src/commit/4ac39c2c776a69be90f19141dd44222fe972dccc
  Author: Rick Macklem <rmacklem at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/nfs/nfs_commonkrpc.c

  Log Message:
  -----------
  nfscl: Fix handling of a bad session slot (NFSv4.1/4.2)

When a session has been marked defunct by the server
sending a NFSERR_BADSESSION reply to the NFSv4.1/4.2
client, nfsv4_sequencelookup() returns NFSERR_BADSESSION
without actually assigning a session slot.
Without this patch, newnfs_request() would erroneously
free slot 0.

This could result in the slot being reused prematurely,
but most likely just generated a "freeing free slot!!"
console message.

This patch fixes the code to not do the erroneous
freeing of the slot for this case.

PR:	260011
(cherry picked from commit 2b612c9d3bb528551de9eaabbdbadae89a36ba8b)


  Commit: 2247de18f4046b1993fbfdc3af87d138326cfcdf
      https://github.com/MidnightBSD/src/commit/2247de18f4046b1993fbfdc3af87d138326cfcdf
  Author: Rick Macklem <rmacklem at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/fs/nfs/nfs_commonkrpc.c

  Log Message:
  -----------
  nfscl: Fix handling of nd_slotid while handling NFSERR_BADSESSION

When the NFSv4.1/4.2 client is handling a server error
of NFSERR_BADSESSION, it retries RPCs with a new session.
Without this patch, the nd_slotid was not being updated
for the new session.

This would result in a bogus console message like
"Wrong session srvslot=X slot=Y" and then it would
free the incorrect slot, often generating a
"freeing free slot!!" console message as well.

This patch fixes the problem.

Note that FreeBSD NFSv4.1/4.2 servers only
generate a NFSERR_BADSESSION error after a reboot
or after a client does a DestroySession operation.

PR:	260011
(cherry picked from commit fb29f817586972444d65b1548287a51f27891639)


  Commit: 767b470dcf6759512737d76a613f830c9533c4dc
      https://github.com/MidnightBSD/src/commit/767b470dcf6759512737d76a613f830c9533c4dc
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M sys/kern/imgact_elf.c

  Log Message:
  -----------
  Disallow invalid PT_GNU_STACK

Stack must be at least readable and writable.

PR:		242570
Reviewed by:	kib, markj
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D35867

(cherry picked from commit fbafa98a94cc7f4f30d71003c230d1b5d4c5960b)


  Commit: d6d5ab89b6462aec6b5198b4f7df2d680dea1311
      https://github.com/MidnightBSD/src/commit/d6d5ab89b6462aec6b5198b4f7df2d680dea1311
  Author: Ed Maste <emaste at FreeBSD.org>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M share/man/man4/vt.4

  Log Message:
  -----------
  vt.4: Provide a hint about Fn + K Scroll Lock combination

Many laptops do not have Scroll Lock and use a function key sequence
to access it.

MFC after:	1 week

Sponsored by:	The FreeBSD Foundation

(cherry picked from commit f39f827222f7d3a21ada5f8af11db4a8753b776a)


Compare: https://github.com/MidnightBSD/src/compare/05ad74fec563%5E...d6d5ab89b646


From noreply at github.com  Tue May  9 15:17:25 2023
From: noreply at github.com (Lucas Holt)
Date: Tue, 09 May 2023 12:17:25 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src] 0e3cb8: Import freebsd
 12-stable fixes from july 17-Sep 4 ...
Message-ID: <MidnightBSD/src/push/refs/heads/master/a0b4b8-0e3cb8@github.com>

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 0e3cb843f7de7bda8f8255d24a22bf7f85cfbba3
      https://github.com/MidnightBSD/src/commit/0e3cb843f7de7bda8f8255d24a22bf7f85cfbba3
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-09 (Tue, 09 May 2023)

  Changed paths:
    M Makefile.inc1
    M contrib/blacklist/bin/blacklistd.conf.5
    M contrib/blacklist/lib/bl.c
    M lib/clang/llvm.build.mk
    M lib/libpathconv/abs2rel.3
    M lib/libpathconv/rel2abs.3
    M lib/libprocstat/libprocstat.h
    M lib/libutil/login_tty.3
    M lib/msun/src/math.h
    M lib/msun/src/s_cbrt.c
    M lib/msun/src/s_cbrtl.c
    M libexec/ftpd/Makefile
    M libexec/ftpd/Makefile.depend
    M libexec/rc/rc.d/wpa_supplicant
    M sbin/ifconfig/ifconfig.8
    M sbin/pfctl/parse.y
    M sbin/pfctl/pfctl_altq.c
    M sbin/pfctl/pfctl_parser.c
    M share/dict/web2
    M share/man/man4/ip6.4
    M share/man/man4/unix.4
    M share/man/man4/vt.4
    M share/man/man5/rc.conf.5
    M share/man/man5/sysctl.conf.5
    M share/man/man5/tmpfs.5
    M share/man/man8/rescue.8
    M share/misc/bsd-family-tree
    M stand/i386/boot2/boot2.c
    M sys/amd64/amd64/pmap.c
    M sys/amd64/vmm/io/ppt.c
    M sys/arm/allwinner/aw_if_dwc.c
    M sys/arm/mv/mv_common.c
    M sys/arm64/arm64/db_trace.c
    M sys/arm64/rockchip/rk_spi.c
    M sys/cam/scsi/scsi_pass.c
    M sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
    M sys/cddl/dev/dtmalloc/dtmalloc.c
    M sys/cddl/dev/dtrace/arm/dtrace_subr.c
    M sys/cddl/dev/dtrace/dtrace_unload.c
    M sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
    M sys/cddl/dev/dtrace/riscv/dtrace_subr.c
    M sys/cddl/dev/fbt/fbt.c
    M sys/cddl/dev/profile/profile.c
    M sys/cddl/dev/prototype.c
    M sys/compat/linux/linux_util.c
    M sys/conf/kern.mk
    M sys/ddb/db_lex.c
    M sys/dev/acpica/acpi_pci_link.c
    M sys/dev/acpica/acpi_timer.c
    M sys/dev/agp/agp.c
    M sys/dev/alc/if_alc.c
    M sys/dev/bce/if_bce.c
    M sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c
    M sys/dev/cxgb/common/cxgb_common.h
    M sys/dev/cxgb/cxgb_sge.c
    M sys/dev/cxgbe/t4_tracer.c
    M sys/dev/drm2/drm_fb_helper.c
    M sys/dev/dwc/if_dwc.c
    M sys/dev/dwc/if_dwc.h
    M sys/dev/ena/ena.c
    M sys/dev/ena/ena.h
    M sys/dev/ena/ena_datapath.c
    M sys/dev/ena/ena_datapath.h
    M sys/dev/ena/ena_netmap.c
    M sys/dev/ena/ena_netmap.h
    M sys/dev/ena/ena_rss.c
    M sys/dev/ena/ena_rss.h
    M sys/dev/ena/ena_sysctl.c
    M sys/dev/ena/ena_sysctl.h
    M sys/dev/fb/fbd.c
    M sys/dev/firewire/fwohci.c
    M sys/dev/gpio/gpioc.c
    M sys/dev/hwpmc/hwpmc_logging.c
    M sys/dev/hwpmc/hwpmc_mod.c
    M sys/dev/hwpmc/hwpmc_x86.c
    M sys/dev/isci/scil/sati_util.c
    M sys/dev/iscsi/icl_soft.c
    M sys/dev/malo/if_malo.c
    M sys/dev/mfi/mfi.c
    M sys/dev/mfi/mfireg.h
    M sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
    M sys/dev/mthca/mthca_cmd.c
    M sys/dev/mwl/if_mwl.c
    M sys/dev/netmap/if_re_netmap.h
    M sys/dev/nvd/nvd.c
    M sys/dev/ocs_fc/ocs_cam.c
    M sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h
    M sys/dev/qat/qatvar.h
    M sys/dev/qlnx/qlnxe/ecore_int.c
    M sys/dev/sfxge/common/efsys.h
    M sys/dev/smartpqi/smartpqi_helper.c
    M sys/dev/speaker/spkr.c
    M sys/dev/usb/input/atp.c
    M sys/dev/vt/vt_core.c
    M sys/dev/xen/blkback/blkback.c
    M sys/dev/xen/blkfront/blkfront.c
    M sys/dev/xen/control/control.c
    M sys/fs/fuse/fuse_device.c
    M sys/fs/fuse/fuse_internal.c
    M sys/fs/fuse/fuse_io.c
    M sys/fs/fuse/fuse_ipc.h
    M sys/fs/fuse/fuse_node.c
    M sys/fs/fuse/fuse_vnops.c
    M sys/fs/nfs/nfs_commonkrpc.c
    M sys/fs/nfsclient/nfs_clkdtrace.c
    M sys/fs/nfsclient/nfs_clrpcops.c
    M sys/fs/nullfs/null_vnops.c
    M sys/geom/geom_dev.c
    M sys/geom/geom_event.c
    M sys/geom/geom_io.c
    M sys/geom/geom_subr.c
    M sys/isa/pnp.c
    M sys/kern/imgact_elf.c
    M sys/kern/kern_cons.c
    M sys/kern/kern_dtrace.c
    M sys/kern/kern_poll.c
    M sys/kern/kern_resource.c
    M sys/kern/kern_umtx.c
    M sys/kern/subr_autoconf.c
    M sys/kern/sysv_msg.c
    M sys/kern/vfs_bio.c
    M sys/kern/vnode_if.src
    M sys/modules/iscsi/Makefile
    M sys/modules/zlib/Makefile
    M sys/net/altq/altq_hfsc.c
    M sys/net/if_lagg.c
    M sys/net/if_vlan.c
    M sys/net/iflib.c
    M sys/net80211/ieee80211_proto.c
    M sys/netgraph/ng_base.c
    M sys/netinet/sctp_indata.c
    M sys/netinet/sctp_output.c
    M sys/netinet/sctp_pcb.c
    M sys/netinet/sctp_sysctl.c
    M sys/netinet/sctp_timer.c
    M sys/netinet/tcp_hpts.c
    M sys/netinet/tcp_log_buf.c
    M sys/netinet/tcp_stacks/rack.c
    M sys/netinet6/nd6.c
    M sys/netipsec/ipsec_mbuf.c
    M sys/netipsec/key.c
    M sys/netipsec/key_debug.c
    M sys/netpfil/ipfw/ip_dummynet.c
    M sys/netpfil/ipfw/ip_fw_iface.c
    M sys/netpfil/ipfw/ip_fw_sockopt.c
    M sys/netpfil/pf/if_pfsync.c
    M sys/netpfil/pf/pf.c
    M sys/netpfil/pf/pf_if.c
    M sys/ofed/drivers/infiniband/core/ib_addr.c
    M sys/opencrypto/criov.c
    M sys/powerpc/aim/aim_machdep.c
    M sys/powerpc/booke/mp_cpudep.c
    M sys/riscv/riscv/db_trace.c
    M sys/rpc/auth_none.c
    M sys/rpc/rpcb_clnt.c
    M sys/rpc/svc_vc.c
    M sys/sys/time.h
    M sys/ufs/ufs/ufs_dirhash.c
    M sys/vm/vm_fault.c
    M tests/sys/cddl/zfs/bin/readmmap.c
    M tests/sys/fs/fusefs/create.cc
    M tests/sys/fs/fusefs/destroy.cc
    M tests/sys/fs/fusefs/dev_fuse_poll.cc
    M tests/sys/fs/fusefs/forget.cc
    M tests/sys/fs/fusefs/link.cc
    M tests/sys/fs/fusefs/lookup.cc
    M tests/sys/fs/fusefs/mkdir.cc
    M tests/sys/fs/fusefs/mknod.cc
    M tests/sys/fs/fusefs/mockfs.cc
    M tests/sys/fs/fusefs/mockfs.hh
    M tests/sys/fs/fusefs/rename.cc
    M tests/sys/fs/fusefs/symlink.cc
    M tests/sys/fs/fusefs/utils.cc
    M tests/sys/fs/fusefs/write.cc
    M tests/sys/sys/Makefile
    A tests/sys/sys/time_test.c
    M tools/test/upsdl/upsdl.c
    M usr.bin/find/find.1
    M usr.bin/minigzip/minigzip.1
    M usr.bin/protect/protect.1
    M usr.bin/vtfontcvt/vtfontcvt.c
    M usr.sbin/bhyve/pci_e82545.c
    M usr.sbin/bhyve/pci_xhci.c
    M usr.sbin/bluetooth/bthidd/server.c
    M usr.sbin/bsdinstall/bsdinstall.8
    M usr.sbin/jail/jail.8
    M usr.sbin/mfiutil/mfiutil.8
    M usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
    M usr.sbin/uhsoctl/uhsoctl.1
    M usr.sbin/wpa/Makefile.inc

  Log Message:
  -----------
  Import freebsd 12-stable fixes from july 17-Sep 4 2022 (#178)

* Merge fix for zfs readmmap test from CheriBSD

Merge commit 1737d8397a0 by Brooks Davis:

  time() is declared in time.h

This fixes a -Werror warning from clang 15:

  tests/sys/cddl/zfs/bin/readmmap.c:97:9: error: call to undeclared function 'time'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]

Obtained from:	https://github.com/CTSRD-CHERI/cheribsd/commit/1737d8397a0
MFC after:	3 days

(cherry picked from commit 47be48457393ba6747cc3144272b1f4d8b9077fb)

* Adjust parse() definition in boot2 to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    stand/i386/boot2/boot2.c:358:6: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]

This is because parse() is declared with a (void) argument list, and
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit e60f6384f9dbe3abe83e59acf0997c591752ff81)

* WPA_DISTDIR does not need to end in a slash

Since all uses of the macro also append a slash, this leads to double
slashes.

MFC after:	3 days

(cherry picked from commit 9917049b60f7cf7345a09d2bc22d51764a477984)

* Remove unused but set variable in cxgb_sge

Clang 15 warns:

    sys/dev/cxgb/cxgb_sge.c:1290:21: error: variable 'txsd' set but not used [-Werror,-Wunused-but-set-variable]
            struct tx_sw_desc *txsd = &txq->sdesc[txqs->pidx];
                               ^

It appears 'txsd' is a leftover from a previous refactoring (see
3f345a5d09b6), but is no longer used for anything, and can be removed
without any functional change.

MFC after:	3 days
Reviewed by:	np
Differential Revision: https://reviews.freebsd.org/D35833

(cherry picked from commit cab040039d6fe1b2a6de8f2ba2cc882c313d3c75)

* Adjust agp_find_device() definition in agp.c to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/agp/agp.c:910:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    agp_find_device()
                   ^
                    void

This is because agp_find_device() is declared with a (void) argument
list, and defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit c0817e2aba26ceb683e9c649c22d7fcd9a921231)

* jail.8: Fix formatting of synopsis and some code examples

MFC after:	3 days

(cherry picked from commit 203be0938dc5e1bd46b028f72077f8531e98a6cd)

* protect.1: document existence of _oomprotect

Improve discoverability of the functionality by mentioning in the
userland tool manual. Add a SEE ALSO entry to rc.conf(5) where more
details are provided.

Sponsored by:   Fudo Security (a.wolk)
Differential Revision:	https://reviews.freebsd.org/D30334

(cherry picked from commit c8b6be0f7d1b92d11b279761685f61f6702700a1)

* protect(1): Correct typo and add newline

Fix a typo, and move a sentence onto a new line in accordance with
mdoc(7) syntax.

While here, also remember to bump .Dd accordingly, as it was missed in
the prior commit.

Reported by:	maxim@

(cherry picked from commit bd1eafcdd02a6f559844aafe0dd0df34a356259d)

* protect.1: Improve synopsis

While here, make the list's -width argument a bit shorter for
readability.

MFC after:	3 days

(cherry picked from commit cb56f86025b88bc4174aa668b3966886b8420955)

* protect.1: Document that protect(1) does not work in jails

The reason is that in order to protect a process procctl(2) needs
the PRIV_VM_MADV_PROTECT privilege, which is currently denied in jails
(see kern_jail.c).

MFC after:	1 week

(cherry picked from commit 6452fb1e87ed9d00b52fa1e63e7c3a7516c9586c)

* rc.conf.5: -Tlint fixes.

(cherry picked from commit 2ce58512957ec373abfb71712687d7e7b6abea82)

* rc.conf(5): Add _limits, _login_class, and _oomprotect

Add a few very useful variables that might easily be overlooked, since
they're only documented in rc.subr(8) which might not be the first place
that people look.

At least _oomprotect has existed since 11.0-RELEASE, and doesn't appear
to be very well-known. While the others aren't as new, in my estimation,
a lot more people would use them if they knew about them.

While here, also add a reference to rc.subr(8) and login.conf(5), and
sort the variables alphabetically.

Reported by: 	Daniel Dettlaff <dmilith at gmail.com>
Reviewed by:	ceri, gbe, 0mp, ygy, a.wolk, pauamma

(cherry picked from commit bd6dce978c1a4d4472c98ff5685de3c2f2bd0203)

* rc.conf.5: Improve documentation of <name>_oomprotect

Apart from improving readability, this commit mentions that
<name>_oomprotect is ignored in a jail environment. Also, replace
${name}_cmd with the correct ${argument}_cmd and point the reader to
rc.subr(8).

MFC after:	1 week

(cherry picked from commit df1817a81e891c4850157e7f21f94b113d663bec)

* sysctl.conf.5: Document rc.d/sysctl and rc.d/sysctl_lastload

Also, update the BUGS section. The example describes an issue, which is
not true anymore thanks to sysctl_lastload. Point readers to rcorder(8)
instead.

MFC after:	2 weeks

(cherry picked from commit 383ccaa4050e3cbbd8ce8163c8aebd07c3d94ab1)

* rescure.8: Do not recommend release artifact disc2

The FreeBSD project does not publish disc2 image anymore.

MFC after:	2 weeks

(cherry picked from commit 7963c02c9bc222e8ac8c1a3acb87451bd74b9733)

* Adjust dtrace_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    In file included from sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c:18440:
    sys/cddl/dev/dtrace/dtrace_unload.c:26:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtrace_unload()
                 ^
                  void

This is because dtrace_unload() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 6f5f44562a72e739a39057a4661a56498e4c79b5)

* Adjust dtmalloc_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/dev/dtmalloc/dtmalloc.c:177:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtmalloc_unload()
                   ^
                    void

This is because dtmalloc_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit a0c55bac79ef684db5f3645fdc1e0fd8da827985)

* Adjust fbd_list() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/dev/fb/fbd.c:205:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    fbd_list()
            ^
             void

This is because fbd_list() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 9863e501c8d482dc47e856a2778dc3cbf6eb6d22)

* Adjust dtrace_getf_barrier() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c:17019:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtrace_getf_barrier()
		       ^
			void

This is because dtrace_getf_barrier() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit bd0e3cc2e71079f54785b7a395faf3a66426936e)

* Adjust dtnfsclient_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/fs/nfsclient/nfs_clkdtrace.c:544:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    dtnfsclient_unload()
                      ^
                       void

This is because dtnfsclient_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 276099434d35b0abd09da946f06c8b8d9765452b)

* Remove unnecessary const and volatile qualifiers from __fp_type_select()

Since https://github.com/llvm/llvm-project/commit/ca75ac5f04f2, clang 15
has a new warning about _Generic selection expressions, such as used in
math.h:

    lib/libc/gdtoa/_ldtoa.c:82:10: error: due to lvalue conversion of the controlling expression, association of type 'volatile float' will never be selected because it is qualified [-Werror,-Wunreachable-code-generic-assoc]
            switch (fpclassify(u.e)) {
                    ^
    lib/msun/src/math.h:109:2: note: expanded from macro 'fpclassify'
            __fp_type_select(x, __fpclassifyf, __fpclassifyd, __fpclassifyl)
            ^
    lib/msun/src/math.h:85:14: note: expanded from macro '__fp_type_select'
        volatile float: f(x),                                               \
                 ^

This is because the controlling expression always undergoes lvalue
conversion first, dropping any cv-qualifiers. The 'const', 'volatile',
and 'volatile const' associations will therefore never be used.

MFC after:	1 week
Reviewed by:	theraven
Differential Revision: https://reviews.freebsd.org/D35815

(cherry picked from commit e50027e38d4f93887691f87b024e0abf37e98c78)

* Adjust profile_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/dev/profile/profile.c:640:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    profile_unload()
                  ^
                   void

This is because profile_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 2d03b58f9a3d5ec1deb35de594fcee22d06bfbb2)

* Adjust db_flush_line() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/ddb/db_lex.c:94:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    db_flush_line()
                 ^
                  void

This is because db_flush_line() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 939cb349b2ca4d3fcdc72ab1258eadee5e54881c)

* Adjust t4_tracer_mod{load,unload}() definitions to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/dev/cxgbe/t4_tracer.c:234:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    t4_tracer_modload()
                     ^
                      void
    sys/dev/cxgbe/t4_tracer.c:243:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    t4_tracer_modunload()
                       ^
                        void

This is because t4_tracer_modload() and t4_tracer_modunload() are
declared with a (void) argument list, but defined with an empty argument
list. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 54e5efb2643ec5f4bf40fef2a1937cd5449a58a0)

* Adjust prototype_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warnings is produced:

    sys/cddl/dev/prototype.c:99:17: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    prototype_unload()
                    ^
                     void

This is because prototype_unload() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 9a979788832e1c31d58923e4c780a6c4b05335d0)

* Suppress unused variable warning in mfi.c

With clang 15, the following -Werror warnings are produced:

    sys/dev/mfi/mfi.c:3698:6: error: variable 'timedout' set but not used [-Werror,-Wunused-but-set-variable]
            int timedout;
                ^
    sys/dev/mfi/mfi.c:3742:6: error: variable 'timedout' set but not used [-Werror,-Wunused-but-set-variable]
            int timedout = 0;
                ^

Here, 'timedout' are variables that are only used when debugging,
requiring #if 0 statements to be modified. Mark the variables as
potentially unused, to suppress the warnings.

MFC after:	3 days

(cherry picked from commit 3dbe05f61b65a73582aefdc2ee5a50ad2b4390ef)

* Suppress unused variable warning in if_malo.c

With clang 15, the following -Werror warning is produced:

    sys/dev/malo/if_malo.c:1573:8: error: variable 'ix' set but not used [-Werror,-Wunused-but-set-variable]
            u_int ix;
                  ^

Here, 'ix' is a variable that is only used when MALO_DEBUG is defined.
Mark the variable as potentially unused, to suppress the warning.

MFC after:	3 days

(cherry picked from commit 218634014374de0032fcdd56656ed6b3650634d2)

* Suppress unused variable warning in ip_dummynet.c

With clang 15, the following -Werror warning is produced:

    sys/netpfil/ipfw/ip_dummynet.c:802:6: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
            int n = 0; /* only for stats */
                ^

Here, 'n' is a variable that is only used when debugging. Mark the
variable as potentially unused, to suppress the warning.

MFC after:	3 days

(cherry picked from commit 5c329f0a4d32cec54250ec2d3f61455e85137a6f)

* Fix unused variable warning in if_alc.c

With clang 15, the following -Werror warning is produced:

    sys/dev/alc/if_alc.c:3441:6: error: variable 'prog' set but not used [-Werror,-Wunused-but-set-variable]
            int prog;
                ^

The 'prog' variable seems to be a left-over from some debugging code
that no longer exists, and can be removed without any functional change.

MFC after:	3 days
Differential Revision: https://reviews.freebsd.org/D35831

(cherry picked from commit 64741244fc4588eefd954948b77ddf2706448ecd)

* Adjust nvd_{load,unload}() definitions to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/dev/nvd/nvd.c:150:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    nvd_load()
            ^
             void
    sys/dev/nvd/nvd.c:166:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    nvd_unload()
              ^
               void

This is because nvd_load() and nvd_unload() are declared with a (void)
argument list, but defined with an empty argument list. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit c46c9b3f5f1eb5575a5e42f52872dbea9cf7516f)

* Suppress unused variable warning in if_mwl.c

With clang 15, the following -Werror warning is produced:

    sys/dev/mwl/if_mwl.c:3445:8: error: variable 'ix' set but not used [-Werror,-Wunused-but-set-variable]
            u_int ix;
                  ^

Here, 'ix' is a variable that is only used when debugging. Mark the
variable as potentially unused, to suppress the warning.

MFC after:	3 days

(cherry picked from commit 52c80d495a1b9dc756452ebcbb945906ea3cf23a)

* nfscl: Fix setting of nfsess_defunct for nfscl_hasexpired()

Commit a7bb120f8b87 added a printf for the case where recovery
has not marked the session defunct by setting nfsess_defunct
to 1.  It turns out that nfscl_hasexpired() calls
nfsrpc_setclient() directly, without setting nfsess_defunct.
This patch replaces the printf with code that sets
nfsess_defunct to 1 to handle this case.

If SIGTERM is issued to a process when it is doing I/O on
an "intr" mount, the NFSv4 server may reply NFSERR_BADSTATEID,
due to the Open being prematurely closed.
This can result in a call to nfscl_hasexpired() to do a
recovery.

This would explain at least one hang described in the PR.

PR: 260011
MFC after:	2 weeks

(cherry picked from commit be7b87de16ffbabb81989e13a4b19a178e3ab8ee)

* Fix unused variable warning in ipsec_mbuf.c

With clang 15, the following -Werror warning is produced:

    sys/netipsec/ipsec_mbuf.c:93:24: error: variable 'alloc' set but not used [-Werror,-Wunused-but-set-variable]
                    int todo, len, done, alloc;
                                         ^

The 'alloc' variable appears to have been a debugging aid that has never
been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit df5d2841d507589af0de7301f6cee3d2b98a35be)

* Adjust vt_mouse_paste() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/vt/vt_core.c:2129:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    vt_mouse_paste()
                  ^
                   void

This is because vt_mouse_paste() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit b77a5e5f5835620ce27114fad9a211d960ed60aa)

* Adjust pcmlog_{initialize,shutdown}() definitions to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    sys/dev/hwpmc/hwpmc_logging.c:1228:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pmclog_initialize()
                     ^
                      void
    sys/dev/hwpmc/hwpmc_logging.c:1277:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pmclog_shutdown()
                   ^
                    void

This is because pcmlog_{initialize,shutdown}() are declared with (void)
argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit ba95c556029357800d18a5bc5abd02a2b7d0c9de)

* Adjust tdsaContext_t::NvmdResponseSet declaration to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    In file included from sys/dev/pms/freebsd/driver/ini/src/agtiapi.c:70:
    sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h:346:13: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
      volatile  NvmdResponseSet;
      ~~~~~~~~  ^
      int

The NvmdResponseSet member is effectively only used as a boolean in the
pms(4) driver, so it could be a single bit. But to avoid changing the
semantics at all in this unmaintained driver, simply declare it as a
volatile int.

MFC after:	3 days

(cherry picked from commit 95204d7a6368990e216db0ad51ef3e6018aed27c)

* Fix unused variable warnings in hwpmc_mod.c

With clang 15, the following -Werror warnings are produced:

    sys/dev/hwpmc/hwpmc_mod.c:4805:6: error: variable 'nfree' set but not used [-Werror,-Wunused-but-set-variable]
            int nfree;
                ^
    sys/dev/hwpmc/hwpmc_mod.c:4804:6: error: variable 'ncallchains' set but not used [-Werror,-Wunused-but-set-variable]
            int ncallchains;
                ^

The 'nfree' and 'ncallchains' variables were used in KASSERTs, but these
were removed due to refactoring in d9f1b8dbf29d. Remove the variables
since they no longer serve any purpose.

MFC after:      3 days

(cherry picked from commit 38a9b8a00ce933e99b4a643cdcc3220be82e7d62)

* Fix unused variable warning in ocs_cam.c

With clang 15, the following -Werror warning is produced:

    sys/dev/ocs_fc/ocs_cam.c:2556:11: error: variable 'count' set but not used [-Werror,-Wunused-but-set-variable]
            uint32_t        count;
                            ^

The 'count' variable seems to be a left-over from some debugging code
that no longer exists, and can be removed without any functional change.

MFC after:	3 days

(cherry picked from commit 8d9e29284627f5e860b7fc194e9fedd6b21f7783)

* Adjust ipfw_{init,destroy}_sopt_handler() definitions to avoid clang 15 warning

With clang 15, the following -Werror warning are produced:

    sys/netpfil/ipfw/ip_fw_sockopt.c:3477:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_init_sopt_handler()
                          ^
                           void
    sys/netpfil/ipfw/ip_fw_sockopt.c:3485:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_destroy_sopt_handler()
                             ^
                              void

This is because ipfw_init_sopt_handler() and ipfw_destroy_sopt_handler()
are declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit d62830c5e493133b0212f39c7efdab4232f87abf)

* Adjust pcm_md_initialize() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/hwpmc/hwpmc_x86.c:245:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pcm_md_initialize()
                     ^
                      void

This is because pcm_md_initialize() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit dc0cde7a21a6aab0a5e876d8f890764e32718932)

* Adjust fbt_unload() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/cddl/dev/fbt/fbt.c:1273:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    fbt_unload()
              ^
               void

This is because fbt_unload() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 6339314c737f44477c1168819353087c2f4816eb)

* Adjust pmc_thread_descriptor_pool_drain() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/hwpmc/hwpmc_mod.c:2462:33: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pmc_thread_descriptor_pool_drain()
                                    ^
                                     void

This is because pmc_thread_descriptor_pool_drain() is declared with a
(void) argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 555d2c9394fa673241fd26a95152adfb9d20952e)

* Adjust iface_khandler_deregister() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netpfil/ipfw/ip_fw_iface.c:159:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    iface_khandler_deregister()
                             ^
                              void

This is because iface_khandler_deregister() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 4100dc46c78cef408369c0fc8dcfd1f87783a1ca)

* Adjust ipfw_{init,destroy}_*() definitions to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/ipfw/ip_fw_sockopt.c:187:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_init_counters()
                      ^
                       void
    sys/netpfil/ipfw/ip_fw_sockopt.c:196:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_destroy_counters()
                         ^
                          void
    sys/netpfil/ipfw/ip_fw_sockopt.c:3241:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_init_obj_rewriter()
                          ^
                           void
    sys/netpfil/ipfw/ip_fw_sockopt.c:3249:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_destroy_obj_rewriter()
                             ^
                              void

This is because ipfw_init_counters(), ipfw_destroy_counters(),
ipfw_init_obj_rewriter(), and ipfw_destroy_obj_rewriter() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 62030bb8538cb3775f6259c81c2c30a533f3ab10)

* Fix unused variable warning in if_lagg.c

With clang 15, the following -Werror warning is produced:

    sys/net/if_lagg.c:2413:6: error: variable 'active_ports' set but not used [-Werror,-Wunused-but-set-variable]
            int active_ports = 0;
                ^

The 'active_ports' variable appears to have been a debugging aid that
has never been used for anything (ref https://reviews.freebsd.org/D549),
so remove it.

MFC after:	3 days

(cherry picked from commit fa267a329ffa3d0e02c3c3a52dd5df5231d92cba)

* Fix unused variable warning in iflib.c

With clang 15, the following -Werror warning is produced:

    sys/net/iflib.c:993:8: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
            u_int n;
                  ^

The 'n' variable appears to have been a debugging aid that has never
been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit 0294e95da4aa272906d4472137b1235d8d8a7180)

* Adjust ipfw_iface_{init,destroy}() definitions to avoid clang 15 warning

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/ipfw/ip_fw_iface.c:206:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_iface_init()
                   ^
                    void
    sys/netpfil/ipfw/ip_fw_iface.c:219:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ipfw_iface_destroy()
                      ^
                       void

This is because ipfw_iface_init() and ipfw_iface_destroy() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 1eea6b9097834484f2238298f550bb418901c313)

* Fix unused variable warning in if_re_netmap.h

With clang 15, the following -Werror warning is produced:

    sys/dev/netmap/if_re_netmap.h:179:8: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
            u_int n;
                  ^

The 'n' variable appears to have been a debugging aid that has never
been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit 8bfedf5852bcb846bfdd2a54989d65cdbb16f7ef)

* Fix unused variable warning in fwohci.c

With clang 15, the following -Werror warning is produced:

    sys/dev/firewire/fwohci.c:2762:23: error: variable 'pcnt' set but not used [-Werror,-Wunused-but-set-variable]
            int len, plen, hlen, pcnt, offset;
                                 ^

The 'pcnt' variable is eventually used only in an #if 0'd block,
obviously meant for debugging. Ensure that 'pcnt' is only declared and
used when COUNT_PACKETS is defined, so the debugging can be easily
turned on later, if desired.

MFC after:	3 days

(cherry picked from commit d7e0d962f39877b997454992a980f4122c6316e7)

* Adjust iface_khandler_register() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netpfil/ipfw/ip_fw_iface.c:128:24: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    iface_khandler_register()
                           ^
                            void

This is because iface_khandler_register() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit edf1e1f78da8c2a19bcee90fe0f72cac2eb18e30)

* blacklistd.conf.5: typo/grammar fixes

PR:		246467
Submitted by:	Mike Lempriere

(cherry picked from commit 36b1f67ca1605b7a0caf204dfce42e7e4d057272)

* blacklistd.conf.5: pluralization correction

Submitted by:	bcr in review D22259
MFC with:	r354399

(cherry picked from commit 9999fa1cd0e8bf8e350c8e65cdb05458820b730e)

* blacklistd: Handle 0 sized messages

Patch obtained from https://github.com/zoulasc/blocklist commit
ada75856bc6fcabbdd25ffbe08fbad5cf2a2c08a

PR:		264599
MFC after:	1 week

(cherry picked from commit b1e81e6ddee42efb0f0d49cfc6cebb48d52e3f08)

* beinstall.8: Update example distsites for BSDINSTALL_DISTSITE

MFC after:	1 week

(cherry picked from commit aa35037ba565bf9f6d5946515ecdcc61a5b22ebb)

* tmpfs.5: Add fstab line example

MFC after:	3 days

(cherry picked from commit 7c2ec6cdf575de11d5ed33109d92e757dd3d072c)

* tmpfs.5: Fix typos and linter warnings

MFC after:	3 days

(cherry picked from commit 2b693e4829265e1e9f73b628c139701e1c259b24)

* vtfontcvt: improve hex font format validation

Previously an EOF would result in sscanf returning -1 leading to a
crash.

MFC after:	1 week
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 119db52f4228fae161306ac29dc739638c132c26)

* ena: Add ena_ring_tx_doorbell() function

Add ena_ring_tx_doorbell function to remove code duplication.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 3501d4f17e8cc0350b8deff671f9991cc7ac280c)

* ena: Move reset completion logging to the reset function

While ena_restore_device is called from the reset task, it can also be
called from other locations in the driver, for example in netmap
specific code. Move the reset completion logging to reset task, so it
better represents when the reset actually happened.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit d209ffee155dd5e505f174a356c8f50c96ebf57e)

* ena: Extend debug prints for invalid req_id resets

Print information about qid if req_id is invalid. Add information about
qid and req_id if mbuf is invalid.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit a9c39b031fe89a6414174e3db82da6548d7fff0f)

* ena: Prevent LLQ initialization when membar isn't exposed

The ena_com_config_dev_mode() function performs many LLQ related
calculations and sends an admin command to configure LLQ in the device.

All the LLQ related operations are unnecessary if the driver fails to
find LLQ memory bar.

Move LLQ memory bar allocation to separate helper function
ena_map_llq_mem_bar and execute this function before LLQ configuration.
If the LLQ memory bar cannot be allocated, then LLQ configuration is
skipped.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 90232d18ca4f7a5a3073a8279a9b9d3228df5f87)

* ena: Store ticks of last Tx cleanup

Store timestamp of last cleanup in Tx ring structure. This does not
change anything during normal operation of the driver but could be
useful when the device fails for some reason.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit d8aba82b5ca75f1a5bff609af141844c4fc9de70)

* ena: Use atomic_load/store functions for first_interrupt variable

Surround cases of possible simultaneous access to the first_interrupt
variable with atomic_load/store functions.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 0ac122c388d9a5e189e60378f1950b82a22bbdd1)

* ena: Move ena_copy_eni_metrics into separate task

Copying ENI metrics was done in callout context, this caused the driver
to panic when sample_interval was set to a value other than 0, as the
admin queue call which was executed could sleep while waiting on
a condition variable. Taskqueue, unlike callout, allows for sleeping, so
moving the function to a separate taskqueue fixes the problem.
ena_timer_service is still responsible for scheduling the taskqueue.

Stop draining the callout during ena_up/ena_down. This was done to
prevent a race between ena_up/down and ena_copy_eni_metrics admin queue
calls. Since ena_metrics_task is protected by ENA_LOCK there is no
possibility of a race between ena_up/down and ena_metrics_task.

Remove a comment about locking in ena_timer_service. With ENI metrics
in a separate task this comment became obsolete.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit b899a02ad7330cae3c9bb08ad7975601dc3b9551)

* ena: Use device_set_desc in probe

During probe the driver created a temporary buffer to which the value of
DEVICE_DESC constant was printed. This buffer was then copied to the
device structure using device_set_desc_copy. Since the value of this
string is exactly the same for every device using the ENA driver, using
sprintf is unnecessary, and device_set_desc can be used instead.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 755e60ca046390bdcfc097b6a8f1a032d47a7b65)

* ena: Fix styling issues

Align code style with FreeBSD style(9) guidelines.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 82e558eacf222ac497bc11fa9f2c7778e97fbc7a)

* ena: Remove write-only datapath variable

The ena_qid variable value is never used. It can be safely removed.
That also silences the compilation warning.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit d5d5ea87236d8f839cad84296f23d285a696195c)

* ena: Align names of constants

Most of the constants in ena.h file were prefixed with ENA_*, while
others did not have this prefix. Align the constants by prefixing the
remaining constants with ENA.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 8f15f8a72b5474b81c5951d4039d203b2d80e2e3)

* ena: Fix invalid KASSERT test in netmap code

The KASSERT was originally added to ensure that the netmap Rx ring is
not NULL, however, it was checking for the opposite.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 79770fdad6c18d968cc122c4294820931cc542e0)

* ena: Update driver version to v2.6.0

Some of the changes in this release:
* Style fixes
* Fix ENI stats probing
* Add trace for the last Tx cleanup call
* Prevent LLQ initialization if member isn't exposed
* Improve logging

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 79e1500276a993c8be857a6e32f0c05ec8f3cdc8)

* ena: Make first_interrupt a uint8_t

We do not have atomic(9) routines for bools, and it is not guaranteed
that sizeof(bool) is 1.

This fixes the KASAN and KMSAN kernel builds, which fail because the
compiler refuses to silently cast a _Bool * to a uint8_t * when calling
the atomic(9) sanitizer interceptors.

Reviewed by:	Dawid G?recki <dgr at semihalf.com>
MFC after:	2 weeks
Fixes:	0ac122c388d9 ("ena: Use atomic_load/store functions for first_interrupt variable")
Differential Revision:	https://reviews.freebsd.org/D35683

(cherry picked from commit b72f1f4516896ad6da0ea74d146a56045de171f7)

* ena: Align req_id and qid print order

In most places, the req_id is printed first, and the qid is printed as a
second. To align the driver, one printout was reworked and the print
order of those variables was changed.

Suggested by: rpokala
Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 38d036e91a8c29bf97b86d441a9d627c5cef2aea)

* ena: Fix LLQ descriptor reconfiguration

After the device reset, the LLQ configuration descriptor wasn't passed
to the hardware. On a 6-generation AWS instances (like C6gn), it is
required to pass the LLQ descriptor after the device reset, otherwise
the hardware will be missing the LLQ configuration resulting in
performance degradation.

This patch reconfigures the LLQ each time the ena_device_init() is
called. This means that the LLQ descriptor will be passed during the
initial configuration and after a reset.

The ena_map_llq_mem_bar() function call was moved before the
ena_device_init() call, to make sure that the mem bar is available.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 3324e304c14d121dc04338a38c7f3277cbfba58b)

* ena: Update driver version to v2.6.1

Minor version update which improves styling of a printouts, fixes
the KASAN and KMSAN kernel builds and LLQ reconfiguration after the
device reset.

Obtained from: Semihalf
MFC after: 2 weeks
Sponsored by: Amazon, Inc.

(cherry picked from commit 25b64933a48c47baef698a302fa2dc5c6e3013ea)

* qat(4): Fix a typo in a source code comment

- s/bufer/buffer/

Obtained from:	NetBSD

(cherry picked from commit 9fd95378f38390c76363e9884e25b37724b8a753)

* pfctl(8): Fix a typo in a source code comment

- s/bufer/buffer/

(cherry picked from commit a101b1b7f24aaabed03b73f2a4dd7acb41bb7a93)

* Adjust svc_vc_null() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/rpc/svc_vc.c:1078:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    svc_vc_null()
               ^
                void

This is because svc_vc_null() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 87d18efef7e3df5f4475cfe1a8f6d6782b7c1527)

* Fix unused variable warning in mlx5_fs_tree.c

With clang 15, the following -Werror warning is produced:

    sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c:1408:15: error: variable 'candidate_group_num' set but not used [-Werror,-Wunused-but-set-variable]
            unsigned int candidate_group_num = 0;
                         ^

The 'candidate_group_num' variable appears to have been a debugging aid
that has never been used for anything, so remove it.

MFC after:	3 days

(cherry picked from commit 6332ad8673fb108dcb8af0aaa42d75ea845748d7)

* Fix unused variable warning in icl_soft.c

With clang 15, the following -Werror warning is produced:

    sys/dev/iscsi//icl_soft.c:886:6: error: variable 'coalesced' set but not used [-Werror,-Wunused-but-set-variable]
            int coalesced, error;
                ^

The 'coalesced' variable is eventually used only in an #if 0'd block,
obviously meant for debugging. Ensure that 'coalesced' is only declared
and used when DEBUG_COALESCED is defined, so the debugging can be easily
turned on later, if desired.

MFC after:	3 days

(cherry picked from commit f4f847018048ac7699b55bc1915a393eb65e4c53)

* Adjust authnone_create() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/rpc/auth_none.c:106:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    authnone_create()
                   ^
                    void

This is because authnone_create() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 90529847cf079d3b7250ae3d3ecd79e843df7973)

* Fix unused variable warning in mlx5_ib_devx.c

With clang 15, the following -Werror warning is produced:

    sys/dev/mthca/mthca_cmd.c:662:23: error: variable 'tc' set but not used [-Werror,-Wunused-but-set-variable]
            int ts __unused = 0, tc = 0;
                                 ^

The 'ts' and 'tc' variables are eventually used only in mthca_dbg()
macros, if CONFIG_INFINIBAND_MTHCA_DEBUG is defined. Ensure 'ts' and
'tc' are only declared and used when CONFIG_INFINIBAND_MTHCA_DEBUG is
defined.

MFC after:	3 days

(cherry picked from commit 5ae3710aeb2a984344fbe36de71612fc1a3d1a71)

* Adjust linux_get_char_devices() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/compat/linux/linux_util.c:243:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    linux_get_char_devices()
                          ^
                           void

This is because linux_get_char_devices() is declared with a (void)
argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit e90d1b57487759e076b16cd3903a7b69565452b9)

* Adjust local_rpcb() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/rpc/rpcb_clnt.c:439:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    local_rpcb()
              ^
               void

This is because local_rpcb() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit e87d90a9dce22003d79ae895bac5ce2d0ca029fe)

* find.1: explain why "find -s" may differ from "find | sort"

In short, that's because a directory name may end
with a character that goes before slash (/).

(cherry picked from commit 26a329f49fb4537d598e93f16054fd9e16f7e677)

* find.1: small language fix after previous change

collate -> collation

(cherry picked from commit d6054ee652a56466277f87bb4bcb757105393c8c)

* ifconfig.8: cleanup reminiscence about long gone ppp(4)

Replace ppp(4) removed since FreeBSD 8.0-RELEASE with vlan(4).
While here, remove commented out reference to non-existing "egress"
interface group hiding since initial import of interface groups
from OpenBSD in 2006.

(cherry picked from commit 3c9ad9398fcdf5f49114fde978b7c837b7ebbc8d)

* ftpd(8): do not refer to now unused libxo(3)

In 2018, the commit r328100 (0fdf7fa846b1a1b1679e86812a1b08b8cb623604)
removed libxo(3) support from ls(1), so ftpd has no reasons to link
with libxo since then.

(cherry picked from commit 796d48ec416863ab2826a1205365710635244023)

* Fix unused variable warning in sctp_timer.c

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_timer.c:510:6: error: variable 'recovery_cnt' set but not used [-Werror,-Wunused-but-set-variable]
            int recovery_cnt = 0;
                ^

The 'recovery_cnt' variable is only used when INVARIANTS is undefined.
Ensure it is only declared and set in that case.

MFC after:	3 days

(cherry picked from commit 5bfd8cf3691381c19296d76d7944d6c1df5f4a75)

* Fix unused variable warning in if_pfsync.c

With clang 15, the following -Werror warning is produced:

    sys/netpfil/pf/if_pfsync.c:2153:9: error: variable 'sent' set but not used [-Werror,-Wunused-but-set-variable]
            int i, sent = 0;
                   ^

The 'sent' variable was used in the for loop later in the
pfsync_bulk_update() function, but refactoring in 4fc65bcbe3fb7 got rid
of it. Remove the variable since it no longer serves any purpose.

MFC after:	3 days

(cherry picked from commit fb48e998501f8d1defecffb772121a4141cdc2b6)

* Adjust function definitions in pf.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/pf/pf.c:985:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_mtag_initialize()
                      ^
                       void
    sys/netpfil/pf/pf.c:995:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_initialize()
                 ^
                  void
    sys/netpfil/pf/pf.c:1089:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_mtag_cleanup()
                   ^
                    void
    sys/netpfil/pf/pf.c:1096:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_cleanup()
              ^
               void
    sys/netpfil/pf/pf.c:1989:27: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_purge_expired_src_nodes()
                              ^
                               void
    sys/netpfil/pf/pf.c:2174:24: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pf_purge_unlinked_rules()
                           ^
                            void

This is because pf_mtag_initialize(), pf_initialize(),
pf_mtag_cleanup(), pf_cleanup(), pf_purge_expired_src_nodes(), and
pf_purge_unlinked_rules() are declared with (void) argument lists, but
defined with empty argument lists. Make the definitions match the
declarations.

MFC after:	3 days

(cherry picked from commit 503b5870c018ec342be1396896560b720945d7e5)

* Fix unused variable warning in sctp_output.c

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_output.c:9367:33: error: variable 'cnt_thru' set but not used [-Werror,-Wunused-but-set-variable]
            int no_fragmentflg, bundle_at, cnt_thru;
                                           ^

The 'cnt_thru' variable was in sctp_output.c when it was first added,
but appears to have been a debugging aid that has never been used, so
remove it.

MFC after:	3 days

(cherry picked from commit 9057feddc4b05d2b2b29e4db274c28af3d574d76)

* Fix unused variable warnings in sctp_indata.c

With clang 15, the following -Werror warnings are produced:

    sys/netinet/sctp_indata.c:3309:6: error: variable 'tot_retrans' set but not used [-Werror,-Wunused-but-set-variable]
            int tot_retrans = 0;
                ^
    sys/netinet/sctp_indata.c:3842:20: error: variable 'resend' set but not used [-Werror,-Wunused-but-set-variable]
            int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                              ^
    sys/netinet/sctp_indata.c:3842:47: error: variable 'acked' set but not used [-Werror,-Wunused-but-set-variable]
            int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                                                         ^
    sys/netinet/sctp_indata.c:3842:58: error: variable 'above' set but not used [-Werror,-Wunused-but-set-variable]
            int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                                                                    ^

The 'tot_retrans' variable was used in sctp_strike_gap_ack_chunks(), but
refactoring in 493d8e5a830e got rid of it. Remove the variable since it
no longer serves any purpose.

The 'resend', 'acked', and 'above' variables are only used when
INVARIANTS is undefined. Ensure they are only declared and set in that
case.

MFC after:	3 days

(cherry picked from commit 05b3a4282c408f495add570bbca12242dd006279)

* Adjust function definitions in if_pfsync.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/netpfil/pf/if_pfsync.c:2439:21: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_pointers_init()
                        ^
                         void
    sys/netpfil/pf/if_pfsync.c:2453:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_pointers_uninit()
                          ^
                           void
    sys/netpfil/pf/if_pfsync.c:2503:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_init()
               ^
                void
    sys/netpfil/pf/if_pfsync.c:2524:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    pfsync_uninit()
                 ^
                  void

This is because pfsync_pointers_init(), pfsync_pointers_uninit(),
pfsync_init(), and pfsync_uninit() are declared with (void) argument
lists, but defined with empty argument lists. Make the definitions match
the declarations.

MFC after:	3 days

(cherry picked from commit 766f3c8032a95f344823bea70bb7f794f9939d33)

* Adjust sctp_init_sysctls() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_sysctl.c:55:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    sctp_init_sysctls()
                     ^
                      void

This is because sctp_init_sysctls() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit 205798564926589ed621b88d1853429d00de6de0)

* Adjust ng_{name,ID}_rehash() definitions to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/netgraph/ng_base.c:981:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ng_name_rehash()
                  ^
                   void
    sys/netgraph/ng_base.c:1012:13: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ng_ID_rehash()
                ^
                 void

This is because ng_name_rehash() and ng_ID_rehash() are declared with
(void) argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit dba7f4aa0909d8c31a0ca0ad0d1208fabfaa9352)

* Adjust function definitions in kern_dtrace.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/kern_dtrace.c:64:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    kdtrace_proc_size()
                     ^
                      void
    sys/kern/kern_dtrace.c:87:20: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    kdtrace_thread_size()
                       ^
                        void

This is because kdtrace_proc_size() and kdtrace_thread_size() are
declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit db8ea61ae261cc060f423dea050bf943bcad6793)

* Adjust function definitions in geom_event.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/geom/geom_event.c:261:13: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_run_events()
                ^
                 void
    sys/geom/geom_event.c:405:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_do_wither()
               ^
                void
    sys/geom/geom_event.c:449:13: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    g_event_init()
                ^
                 void

This is because g_run_events(), g_do_wither(), and g_event_init() are
declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit ac3153434fcc3ddcbb47c7f397a1bc34fd0e0dcb)

* Adjust sctp_drain() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/netinet/sctp_pcb.c:6946:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    sctp_drain()
              ^
               void

This is because sctp_drain() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 24e13a49faabb22ece97dc8e4718caf8f6bad84c)

* Fix unused variable warning in xen's blkback.c

With clang 15, the following -Werror warning is produced:

    sys/dev/xen/blkback/blkback.c:1561:12: error: variable 'req_seg_idx' set but not used [-Werror,-Wunused-but-set-variable]
                    u_int                    req_seg_idx;
                                             ^

The 'req_seg_idx' variable was used in the for loop later in the
xbb_dispatch_io() function, but refactoring in 112cacaee408 got rid of
it. Remove the variable since it no longer serves any purpose.

MFC after:	3 days

(cherry picked from commit 39e12a7591bf2ed4b2fae48e19f3af3a3cdcb196)

* Adjust function definition in acpi_timer.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/dev/acpica/acpi_timer.c:402:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    acpi_timer_test()
                   ^
                    void

This is because acpi_timer_test() is declared with a (void) argument
list, but defined with an empty argument list. Make the definition match
the declaration.

MFC after:	3 days

(cherry picked from commit c45bc02560b0f632f8e085679512a588bfcb3384)

* Adjust function definitions in kern_resource.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/kern_resource.c:1212:10: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    lim_alloc()
             ^
              void
    sys/kern/kern_resource.c:1365:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    uihashinit()
              ^
               void

This is because lim_alloc() and uihashinit() are declared with (void)
argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit f2eb09b089bcdf546ed3fd4c2c59d9df02c585d8)

* Adjust function definition in nd6.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/netinet6/nd6.c:247:12: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    nd6_destroy()
               ^
                void

This is nd6_destroy() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 50207b2de9a53491c2b5ee9b96689333f5c46de5)

* Adjust function definition in vfs_bio.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/kern/vfs_bio.c:3430:11: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    buf_daemon()
              ^
               void

This is because buf_daemon() is declared with a (void) argument list,
but defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit a387bd1b6a0e18d7abafcbb5ae1870be0604ff15)

* Adjust function definitions in sysv_msg.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/sysv_msg.c:213:8: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    msginit()
           ^
            void
    sys/kern/sysv_msg.c:316:10: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    msgunload()
             ^
              void

This is because msginit() and msgunload() are declared with (void)
argument lists, but defined with empty argument lists. Make the
definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 78cfed2de70d023acb452c06dbd1ffd8341f4608)

* Adjust function definition in subr_autoconf.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/kern/subr_autoconf.c:119:34: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    run_interrupt_driven_config_hooks()
                                     ^
                                      void

This is because run_interrupt_driven_config_hooks() is declared with a
(void) argument list, but defined with an empty argument list. Make the
definition match the declaration.

MFC after:	3 days

(cherry picked from commit 3c8f0790dd038ce646f140b7aad23b4e698c0522)

* Fix unused variable warning in ieee80211_proto.c

With clang 15, the following -Werror warning is produced:

    sys/net80211/ieee80211_proto.c:1070:34: error: variable 'num_mixed' set but not used [-Werror,-Wunused-but-set-variable]
            int num_vaps = 0, num_pure = 0, num_mixed = 0;
                                            ^

The 'num_mixed' variable was in ieee80211_proto.c when the function
vap_update_ht_protmode() was added, but it was never used for anything,
so remove it.

MFC after:	3 days

(cherry picked from commit 9319211f96c6f11959c76f1d565a744ab37b0031)

* Adjust function definition in ufs_dirhash.c to avoid clang 15 warnings

With clang 15, the following -Werror warning is produced:

    sys/ufs/ufs/ufs_dirhash.c:1252:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ufsdirhash_lowmem()
                     ^
                      void

This is ufsdirhash_lowmem() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 08c16dd4bf6ee5649a86fa472104f89b3fbfe71a)

* Suppress -Wstrict-prototypes for several zlib files

Clang 15 is more strict about function definitions not matching
declarations, and zlib has a lot of these, but since it is contributed
code (and in K&R style to boot), suppress those warnings instead.

MFC after:	3 days

(cherry picked from commit e83ffec3af2e71cc64348d58481c87db9efbac92)

* Fix unused variable warning in ffs_snapshot.c

With clang 15, the following -Werror warning is produced:

    sys/ufs/ffs/ffs_snapshot.c:204:7: error: variable 'redo' set but not used [-Werror,-Wunused-but-set-variable]
            long redo = 0, snaplistsize = 0;
                 ^

The 'redo' variable is only used when DIAGNOSTIC is defined. Ensure it
is only declared and set in that case.

MFC after:	3 days

(cherry picked from commit c9dde6f0c713a027266c52cf94a33a086348c566)

* Adjust playinit() definition to avoid clang 15 warning

With clang 15, the following -Werror warning is produced:

    sys/dev/speaker/spkr.c:182:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    playinit()
            ^
             void

This is because playinit() is declared with a (void) argument list, but
defined with an empty argument list. Make the definition match the
declaration.

MFC after:	3 days

(cherry picked from commit 57c46916e145581807333bc06a08e9532721bd8f)

* Fix unused variable warning in amd64's pmap.c

With clang 15, the following -Werror warning is produced:

    sys/amd64/amd64/pmap.c:8274:22: error: variable 'freed' set but not used [-Werror,-Wunused-but-set-variable]
            int allfree, field, freed, i, idx;
                                ^

The 'freed' variable is only used when PV_STATS is defined. Ensure it is
only declared and set in that case.

MFC after:	3 days

(cherry picked from commit 7a1f289bd2949e5867c7f0396c35f02f179dc8bd)

* Adjust function definitions in kern_cons.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/kern/kern_cons.c:201:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cninit_finish()
                 ^
                  void
    sys/kern/kern_cons.c:376:7: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cngrab()
          ^
           void
    sys/kern/kern_cons.c:389:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cnungrab()
            ^
             void
    sys/kern/kern_cons.c:402:9: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    cnresume()
            ^
             void

This is because cninit_finish(), cngrab(), cnungrab(), and cnresume()
are declared with (void) argument lists, but defined with empty argument
lists. Make the definitions match the declarations.

MFC after:	3 days

(cherry picked from commit 9806e82a23924f32dc5976bc8687fbbe293a140b)

* Fix unused variable warning in sfxge's ef10_tx.c

With clang 15, the following -Werror warning is produced:

    sys/dev/sfxge/common/ef10_tx.c:345:15: error: variable 'eqp' set but not used [-Werror,-Wunused-but-set-variable]
            efx_qword_t *eqp;
                         ^

The 'eqp' variable is passed as an argument to the EFSYS_BAR_WC_WRITEQ()
macro, but currently this macro ignores the argument, similar to its
other _esbp argument. Silence the warning by casting the _eqp argument
to void in the macro.

MFC after:	3 days

(cherry picked from commit a79731b9453320af6fcf5ec16fa5de900dadbce8)

* Adjust function definitions in ufs_dirhash.c to avoid clang 15 warnings

With clang 15, the following -Werror warnings are produced:

    sys/ufs/ufs/ufs_dirhash.c:1303:16: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ufsdirhash_init()
                   ^
                    void
    sys/ufs/ufs/ufs_dirhash.c:1319:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
    ufsdirhash_uninit()
                     ^
                      void

This is because ufsdirhash_init() and ufsdirhash_uninit() are declared
with (void) argument lists, but defined with empty argument lists. Make
the definitions match the declarations.

MFC after:	3 days

(cherry picked ?




From noreply at github.com  Sun May 14 15:02:26 2023
From: noreply at github.com (Lucas Holt)
Date: Sun, 14 May 2023 12:02:26 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src]
Message-ID: <MidnightBSD/src/push/refs/tags/vendor/mport/2.4.1/000000-66fb76@github.com>

  Branch: refs/tags/vendor/mport/2.4.1
  Home:   https://github.com/MidnightBSD/src

From noreply at github.com  Sun May 14 15:02:26 2023
From: noreply at github.com (Lucas Holt)
Date: Sun, 14 May 2023 12:02:26 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src] 10e598: mport 2.4.1
Message-ID: <MidnightBSD/src/push/refs/heads/vendor/mport/e9df86-10e598@github.com>

  Branch: refs/heads/vendor/mport
  Home:   https://github.com/MidnightBSD/src
  Commit: 10e598c362636e4c04c67633969270461384eae5
      https://github.com/MidnightBSD/src/commit/10e598c362636e4c04c67633969270461384eae5
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M Jenkinsfile
    M README.md
    M libexec/mport.check-for-older/mport.check-for-older.c
    M libexec/mport.create/mport.create.c
    M libexec/mport.delete/mport.delete.c
    M libexec/mport.fetch/mport.fetch.c
    M libexec/mport.info/mport.info.c
    M libexec/mport.init/mport.init.c
    M libexec/mport.install/mport.install.c
    M libexec/mport.list/mport.list.c
    M libexec/mport.merge/mport.merge.c
    M libexec/mport.query/mport.query.c
    M libexec/mport.update/mport.update.c
    M libexec/mport.updepends/mport.updepends.c
    M libmport/Makefile
    A libmport/audit.c
    M libmport/fetch.c
    M libmport/index.c
    M libmport/info.c
    M libmport/instance.c
    M libmport/mport.h
    M libmport/mport_private.h
    M libmport/pkgmeta.c
    M libmport/util.c
    M mport/mport.1
    M mport/mport.c

  Log Message:
  -----------
  mport 2.4.1



From noreply at github.com  Sun May 14 15:06:08 2023
From: noreply at github.com (Lucas Holt)
Date: Sun, 14 May 2023 12:06:08 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src] 10e598: mport 2.4.1
Message-ID: <MidnightBSD/src/push/refs/heads/master/0e3cb8-9972d8@github.com>

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 10e598c362636e4c04c67633969270461384eae5
      https://github.com/MidnightBSD/src/commit/10e598c362636e4c04c67633969270461384eae5
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M Jenkinsfile
    M README.md
    M libexec/mport.check-for-older/mport.check-for-older.c
    M libexec/mport.create/mport.create.c
    M libexec/mport.delete/mport.delete.c
    M libexec/mport.fetch/mport.fetch.c
    M libexec/mport.info/mport.info.c
    M libexec/mport.init/mport.init.c
    M libexec/mport.install/mport.install.c
    M libexec/mport.list/mport.list.c
    M libexec/mport.merge/mport.merge.c
    M libexec/mport.query/mport.query.c
    M libexec/mport.update/mport.update.c
    M libexec/mport.updepends/mport.updepends.c
    M libmport/Makefile
    A libmport/audit.c
    M libmport/fetch.c
    M libmport/index.c
    M libmport/info.c
    M libmport/instance.c
    M libmport/mport.h
    M libmport/mport_private.h
    M libmport/pkgmeta.c
    M libmport/util.c
    M mport/mport.1
    M mport/mport.c

  Log Message:
  -----------
  mport 2.4.1


  Commit: ea52756144b970830b4484ef33968ec098f4e6b5
      https://github.com/MidnightBSD/src/commit/ea52756144b970830b4484ef33968ec098f4e6b5
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M usr.sbin/etcupdate/tests/preworld_test.sh

  Log Message:
  -----------
  update test


  Commit: 0e727c2d014cd775f243e0ca28a6585ab69b1500
      https://github.com/MidnightBSD/src/commit/0e727c2d014cd775f243e0ca28a6585ab69b1500
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M contrib/mport/Jenkinsfile
    M contrib/mport/README.md
    M contrib/mport/libexec/mport.check-for-older/mport.check-for-older.c
    M contrib/mport/libexec/mport.create/mport.create.c
    M contrib/mport/libexec/mport.delete/mport.delete.c
    M contrib/mport/libexec/mport.fetch/mport.fetch.c
    M contrib/mport/libexec/mport.info/mport.info.c
    M contrib/mport/libexec/mport.init/mport.init.c
    M contrib/mport/libexec/mport.install/mport.install.c
    M contrib/mport/libexec/mport.list/mport.list.c
    M contrib/mport/libexec/mport.merge/mport.merge.c
    M contrib/mport/libexec/mport.query/mport.query.c
    M contrib/mport/libexec/mport.update/mport.update.c
    M contrib/mport/libexec/mport.updepends/mport.updepends.c
    M contrib/mport/libmport/Makefile
    A contrib/mport/libmport/audit.c
    M contrib/mport/libmport/fetch.c
    M contrib/mport/libmport/index.c
    M contrib/mport/libmport/info.c
    M contrib/mport/libmport/instance.c
    M contrib/mport/libmport/mport.h
    M contrib/mport/libmport/mport_private.h
    M contrib/mport/libmport/pkgmeta.c
    M contrib/mport/libmport/util.c
    M contrib/mport/mport/mport.1
    M contrib/mport/mport/mport.c

  Log Message:
  -----------
  Merge commit '10e598c362636e4c04c67633969270461384eae5'


  Commit: 9972d8e679f77d313bea5ff52736f30c7143629b
      https://github.com/MidnightBSD/src/commit/9972d8e679f77d313bea5ff52736f30c7143629b
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M UPDATING

  Log Message:
  -----------
  mport 2.4.1


Compare: https://github.com/MidnightBSD/src/compare/0e3cb843f7de...9972d8e679f7

From noreply at github.com  Sun May 14 15:07:12 2023
From: noreply at github.com (Lucas Holt)
Date: Sun, 14 May 2023 12:07:12 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src] 10e598: mport 2.4.1
Message-ID: <MidnightBSD/src/push/refs/heads/stable/3.0/21fa3b-9e3192@github.com>

  Branch: refs/heads/stable/3.0
  Home:   https://github.com/MidnightBSD/src
  Commit: 10e598c362636e4c04c67633969270461384eae5
      https://github.com/MidnightBSD/src/commit/10e598c362636e4c04c67633969270461384eae5
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M Jenkinsfile
    M README.md
    M libexec/mport.check-for-older/mport.check-for-older.c
    M libexec/mport.create/mport.create.c
    M libexec/mport.delete/mport.delete.c
    M libexec/mport.fetch/mport.fetch.c
    M libexec/mport.info/mport.info.c
    M libexec/mport.init/mport.init.c
    M libexec/mport.install/mport.install.c
    M libexec/mport.list/mport.list.c
    M libexec/mport.merge/mport.merge.c
    M libexec/mport.query/mport.query.c
    M libexec/mport.update/mport.update.c
    M libexec/mport.updepends/mport.updepends.c
    M libmport/Makefile
    A libmport/audit.c
    M libmport/fetch.c
    M libmport/index.c
    M libmport/info.c
    M libmport/instance.c
    M libmport/mport.h
    M libmport/mport_private.h
    M libmport/pkgmeta.c
    M libmport/util.c
    M mport/mport.1
    M mport/mport.c

  Log Message:
  -----------
  mport 2.4.1


  Commit: 9e3192f39c8f2e1f1c00b5158a507ea1c9c8e576
      https://github.com/MidnightBSD/src/commit/9e3192f39c8f2e1f1c00b5158a507ea1c9c8e576
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M contrib/mport/Jenkinsfile
    M contrib/mport/README.md
    M contrib/mport/libexec/mport.check-for-older/mport.check-for-older.c
    M contrib/mport/libexec/mport.create/mport.create.c
    M contrib/mport/libexec/mport.delete/mport.delete.c
    M contrib/mport/libexec/mport.fetch/mport.fetch.c
    M contrib/mport/libexec/mport.info/mport.info.c
    M contrib/mport/libexec/mport.init/mport.init.c
    M contrib/mport/libexec/mport.install/mport.install.c
    M contrib/mport/libexec/mport.list/mport.list.c
    M contrib/mport/libexec/mport.merge/mport.merge.c
    M contrib/mport/libexec/mport.query/mport.query.c
    M contrib/mport/libexec/mport.update/mport.update.c
    M contrib/mport/libexec/mport.updepends/mport.updepends.c
    M contrib/mport/libmport/Makefile
    A contrib/mport/libmport/audit.c
    M contrib/mport/libmport/fetch.c
    M contrib/mport/libmport/index.c
    M contrib/mport/libmport/info.c
    M contrib/mport/libmport/instance.c
    M contrib/mport/libmport/mport.h
    M contrib/mport/libmport/mport_private.h
    M contrib/mport/libmport/pkgmeta.c
    M contrib/mport/libmport/util.c
    M contrib/mport/mport/mport.1
    M contrib/mport/mport/mport.c

  Log Message:
  -----------
  Merge commit '10e598c362636e4c04c67633969270461384eae5' into stable/3.0


Compare: https://github.com/MidnightBSD/src/compare/21fa3b1d032d...9e3192f39c8f

From noreply at github.com  Sun May 14 15:08:30 2023
From: noreply at github.com (Lucas Holt)
Date: Sun, 14 May 2023 12:08:30 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src] 56776d: fix libmport audit.c
 incluson
Message-ID: <MidnightBSD/src/push/refs/heads/stable/3.0/9e3192-56776d@github.com>

  Branch: refs/heads/stable/3.0
  Home:   https://github.com/MidnightBSD/src
  Commit: 56776de71020276a1935c4d1305917c28b2f6d13
      https://github.com/MidnightBSD/src/commit/56776de71020276a1935c4d1305917c28b2f6d13
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M lib/libmport/Makefile

  Log Message:
  -----------
  fix libmport audit.c incluson



From noreply at github.com  Sun May 14 15:09:43 2023
From: noreply at github.com (Lucas Holt)
Date: Sun, 14 May 2023 12:09:43 -0700
Subject: [Midnightbsd-cvs] [MidnightBSD/src] 8709aa: fix libmport audit.c
 incluson
Message-ID: <MidnightBSD/src/push/refs/heads/master/9972d8-8709aa@github.com>

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 8709aab08694ea5d353e453e0587a65f40a62c11
      https://github.com/MidnightBSD/src/commit/8709aab08694ea5d353e453e0587a65f40a62c11
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M lib/libmport/Makefile

  Log Message:
  -----------
  fix libmport audit.c incluson