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

sockstat: Unbreak SEE ALSO section

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

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

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

printenv: Clean up

* Error out if more than one argument is given.

* Check for stdio errors.

* Clean up the code.

* Clean up and expand the tests.

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

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

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

ident: Clean up

* Use libcasper instead of reinventing it.

* Add long option support.

* Drop pointless use of temporary locales.

* Consistently check for stdio errors.

* Clean up the code.

* Clean up and expand the tests.

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

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

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

tests.7: Provide better examples

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

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

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

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

FreeBSD/src 47799d1. README.md

README: Update and harmonize

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

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

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

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

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

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

FreeBSD/src e6b2a40share/man/man7 build.7

build.7: Explain specifying multiple KERNCONFs

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

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

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

build.7: Improve make delete-old example

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

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

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

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

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

build.7: Explain packaging a custom kernel

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

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

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

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

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

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

FreeBSD/src 1633c00sys/dev/adb adb_bus.c, sys/dev/atkbdc psm.c

chore: replace {0, 0} with {DEV,KOBJ}METHOD_END

Both of the aforementioned macros have been present in FreeBSD
for well over a decade: 2009 for `KOBJMETHOD_END`; 2011 for
`DEVMETHOD_END`.

Adapt all hardcoded references of `{0, 0}` with `DEVMETHOD_END`
and `KOBJMETHOD_END` as appropriate. This helps ensure that
future adaptations to drivers following patterns documented
in driver(9) can be made more easily/without issue.

MFC after:      1 week
Differential Revision:   https://reviews.freebsd.org/D55414

MFC notes:
        All conflicts were dropped as they didn't apply to code in branch.

Conflicts:
        sys/dev/flash/w25n.c

    [7 lines not shown]
DeltaFile
+6-6sys/dev/adb/adb_bus.c
+6-6sys/dev/sound/pci/vibes.c
+2-2sys/dev/atkbdc/psm.c
+2-2sys/dev/axgbe/if_axgbe.c
+2-2sys/dev/cxgbe/t4_main.c
+2-2sys/dev/dpaa/bman_fdt.c
+20-20174 files not shown
+201-201180 files

FreeBSD/src 1b5bee9sys/dev/adb adb_bus.c, sys/dev/atkbdc psm.c

chore: replace {0, 0} with {DEV,KOBJ}METHOD_END

Both of the aforementioned macros have been present in FreeBSD
for well over a decade: 2009 for `KOBJMETHOD_END`; 2011 for
`DEVMETHOD_END`.

Adapt all hardcoded references of `{0, 0}` with `DEVMETHOD_END`
and `KOBJMETHOD_END` as appropriate. This helps ensure that
future adaptations to drivers following patterns documented
in driver(9) can be made more easily/without issue.

MFC after:      1 week
Differential Revision:   https://reviews.freebsd.org/D55414

MFC notes:
- All changes to nvme/nvd were dropped as they didn't apply.
- Change to ufshci_pci.c was adjusted to match code in branch.

Conflicts:

    [5 lines not shown]
DeltaFile
+6-6sys/dev/adb/adb_bus.c
+6-6sys/dev/sound/pci/vibes.c
+2-2sys/dev/usb/input/uep.c
+2-2sys/dev/atkbdc/psm.c
+2-2sys/dev/axgbe/if_axgbe.c
+2-2sys/dev/cxgbe/t4_main.c
+20-20178 files not shown
+205-205184 files

FreeBSD/src ca93c98sys/dev/asmc asmc.c

use ASMC_FAN_FUNCS2 to avoid trying to read non-existent keys

Signed-off-by: tslight <tslight at pm.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2051
(cherry picked from commit cecd12ac3b4d98bd52dc0e802a4a38bc72f50e2c)
DeltaFile
+1-1sys/dev/asmc/asmc.c
+1-11 files

FreeBSD/src a2c7643sys/dev/asmc asmc.c

use ASMC_FAN_FUNCS2 to avoid trying to read non-existent keys

Signed-off-by: tslight <tslight at pm.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2051
(cherry picked from commit cecd12ac3b4d98bd52dc0e802a4a38bc72f50e2c)
DeltaFile
+1-1sys/dev/asmc/asmc.c
+1-11 files

FreeBSD/src cac2368sys/dev/asmc asmcvar.h asmc.c

Add ASMC support for Macbook Pro 8,3

Signed-off-by: tslight <tslight at pm.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1992
(cherry picked from commit 16c82e28404ec959a7335ceae1d4f43881a50d9e)
DeltaFile
+33-0sys/dev/asmc/asmcvar.h
+6-0sys/dev/asmc/asmc.c
+39-02 files

FreeBSD/src ae09e4asys/dev/asmc asmcvar.h asmc.c

Add ASMC support for Macbook Pro 8,3

Signed-off-by: tslight <tslight at pm.com>
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1992
(cherry picked from commit 16c82e28404ec959a7335ceae1d4f43881a50d9e)
DeltaFile
+33-0sys/dev/asmc/asmcvar.h
+6-0sys/dev/asmc/asmc.c
+39-02 files

FreeBSD/src c8ad757sys/dev/asmc asmc.c

asmc: use symbolic names with the MacPro3,1 model

Use `ASMC_LIGHT_FUNCS_DISABLED` and `ASMC_SMS_FUNCS_DISABLED` instead of
the unrolled versions of the macros.

This makes it easier to adjust the underlying macros/fields for
`struct asmc_model`.

No functional change intended.

MFC after:      1 week

(cherry picked from commit 90edc16166a6fef03d2384247d07d64656f03309)
DeltaFile
+2-2sys/dev/asmc/asmc.c
+2-21 files

FreeBSD/src 0f79ce7sys/dev/asmc asmc.c

asmc: use symbolic names with the MacPro3,1 model

Use `ASMC_LIGHT_FUNCS_DISABLED` and `ASMC_SMS_FUNCS_DISABLED` instead of
the unrolled versions of the macros.

This makes it easier to adjust the underlying macros/fields for
`struct asmc_model`.

No functional change intended.

MFC after:      1 week

(cherry picked from commit 90edc16166a6fef03d2384247d07d64656f03309)
DeltaFile
+2-2sys/dev/asmc/asmc.c
+2-21 files

FreeBSD/src 0770a76sys/dev/asmc asmc.c

asmc: code style modernization and minor cleanups

- Allow `ASMC_DEBUG` to be treated as a variadic macro.
- Add ellipses around `sizeof(..)` calls.
- Reindent some of the lines to better follow style(9) with line
  wrapping.

A number of other clang-format changes were not taken as they are not
compatible with style(9).

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55394

(cherry picked from commit e20e26e4e271ecb74e40d9a95ed3112ceaf9604f)
DeltaFile
+47-59sys/dev/asmc/asmc.c
+47-591 files

FreeBSD/src 732d45esys/dev/asmc asmc.c

asmc: code style modernization and minor cleanups

- Allow `ASMC_DEBUG` to be treated as a variadic macro.
- Add ellipses around `sizeof(..)` calls.
- Reindent some of the lines to better follow style(9) with line
  wrapping.

A number of other clang-format changes were not taken as they are not
compatible with style(9).

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55394

(cherry picked from commit e20e26e4e271ecb74e40d9a95ed3112ceaf9604f)
DeltaFile
+47-59sys/dev/asmc/asmc.c
+47-591 files

FreeBSD/src 608749csys/netinet ip_divert.c

divert: unbreak the LINT-NOIP build

Only expose `dcb` when either `INET` or `INET6` is defined.

Reported by:    clang (`-Wunused`)
MFC after:      1 week
Fixes 5547a7bb39 ("divert: Use a better source identifier...")
Differential Revision: https://reviews.freebsd.org/D55548

(cherry picked from commit bd758ebac3272f720c051570e043e4bc653dcd48)
DeltaFile
+3-2sys/netinet/ip_divert.c
+3-21 files

FreeBSD/src 3303090lib/libnetbsd math.h, lib/libnetbsd/sys time.h

libnetbsd: add math.h and sys/time.h

- `math.h`: `isinff(..)`
- `sys/time.h`: `timespec*(x)`

These two headers are used by tests in newer snapshots of
`contrib/netbsd-tests`.

MFC after:      1 week

(cherry picked from commit 2a6c2d9c38dc421025b6c18cac68fe9965c574c0)
DeltaFile
+35-0lib/libnetbsd/sys/time.h
+14-0lib/libnetbsd/math.h
+49-02 files

FreeBSD/src 7be895elib/libnetbsd/sys cdefs.h

libnetbsd: import `__CTASSERT(..)` macros

These compile-time assert macros are similar to `Static_assert` on FreeBSD.

These macros are in use in newer versions of `contrib/netbsd-tests`.

Obtained from:  https://github.com/NetBSD/src (c26cc77b3a0b26b95a2)
MFC after:      1 week

(cherry picked from commit d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08)
DeltaFile
+16-0lib/libnetbsd/sys/cdefs.h
+16-01 files

FreeBSD/src ee828a4lib/libnetbsd/sys cdefs.h

lib/libnetbsd: bring in `__type_m{ax,in}*` macro family

These macros are used by some of the NetBSD tests which calculate the
size of types, e.g., `__type_max(time_t)`.

This wraps up the set of macros needed in order to update to the a
netbsd-tests snapshot from this past month.

Obtained from:  https://github.com/netbsd/src (55b4b44)
MFC after:      1 week

(cherry picked from commit db5344a7445f1a796bc3cacd32a46e88e3e589a7)
DeltaFile
+30-0lib/libnetbsd/sys/cdefs.h
+30-01 files

FreeBSD/src f816257lib/libnetbsd math.h, lib/libnetbsd/sys time.h

libnetbsd: add math.h and sys/time.h

- `math.h`: `isinff(..)`
- `sys/time.h`: `timespec*(x)`

These two headers are used by tests in newer snapshots of
`contrib/netbsd-tests`.

MFC after:      1 week

(cherry picked from commit 2a6c2d9c38dc421025b6c18cac68fe9965c574c0)
DeltaFile
+35-0lib/libnetbsd/sys/time.h
+14-0lib/libnetbsd/math.h
+49-02 files

FreeBSD/src 0b97abalib/libnetbsd/sys cdefs.h

libnetbsd: import `__CTASSERT(..)` macros

These compile-time assert macros are similar to `Static_assert` on FreeBSD.

These macros are in use in newer versions of `contrib/netbsd-tests`.

Obtained from:  https://github.com/NetBSD/src (c26cc77b3a0b26b95a2)
MFC after:      1 week

(cherry picked from commit d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08)
DeltaFile
+16-0lib/libnetbsd/sys/cdefs.h
+16-01 files

FreeBSD/src 1f86a86lib/libnetbsd/sys cdefs.h

lib/libnetbsd: bring in `__type_m{ax,in}*` macro family

These macros are used by some of the NetBSD tests which calculate the
size of types, e.g., `__type_max(time_t)`.

This wraps up the set of macros needed in order to update to the a
netbsd-tests snapshot from this past month.

Obtained from:  https://github.com/netbsd/src (55b4b44)
MFC after:      1 week

(cherry picked from commit db5344a7445f1a796bc3cacd32a46e88e3e589a7)
DeltaFile
+30-0lib/libnetbsd/sys/cdefs.h
+30-01 files

FreeBSD/src 68511df. .gitignore

.gitignore: ignore additional unwanted files

Ignore more files generated by toolchains, e.g., `.pico`, etc. Ignore the
`.DS_Store` produced by macOS as well because all they provide is
additional file metadata that shouldn't be committed to `git`.

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55096

(cherry picked from commit 4544f34f2d30ee63ab1eec9fa52c31bd92d457ca)
DeltaFile
+10-0.gitignore
+10-01 files

FreeBSD/src 079bfe2. .gitignore

.gitignore: ignore additional unwanted files

Ignore more files generated by toolchains, e.g., `.pico`, etc. Ignore the
`.DS_Store` produced by macOS as well because all they provide is
additional file metadata that shouldn't be committed to `git`.

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D55096

(cherry picked from commit 4544f34f2d30ee63ab1eec9fa52c31bd92d457ca)
DeltaFile
+10-0.gitignore
+10-01 files

FreeBSD/src 833df8dsys/dev/asmc asmcvar.h asmc.c

asmc: Add MacPro3,1 temperature sensor support

Test and verified with Sonicblue7

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D54952

(cherry picked from commit 90d79dd549461dac053b34d47ae32968afb2834c)
DeltaFile
+69-0sys/dev/asmc/asmcvar.h
+9-0sys/dev/asmc/asmc.c
+78-02 files