]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
acpica: Create merge commit against vendor branch
authorWarner Losh <imp@FreeBSD.org>
Mon, 5 Feb 2024 22:13:57 +0000 (15:13 -0700)
committerWarner Losh <imp@FreeBSD.org>
Mon, 5 Feb 2024 22:17:02 +0000 (15:17 -0700)
commita841e5470385fa62fa65d6de5bcba33afdbf42ea
tree9632d72fbe929b3260b9906e4ad7957a8f96dc9f
parent6d4a140acfdf637bb559d371c583e4db478e1549
parentef3ba9d625927fd4592a8c071698a562821485bd
acpica: Create merge commit against vendor branch

Merge tracking branch 'vendor/acpica' for vendor/acpica/20230628, and
resolve conflicts.

This deletes files that we've deleted since the last merge (during SVN
times it seems) so future merges don't bring them up.

It resolves conflicts in several files that we have modified (but we can
likely fix the build system so we don't have to modify them since it's
almost all headers) and one ifndef kernel that could be solved with an
empty #define.

It also deletes new files in the platform directory that are similar to
prior non-freebsd platform files we've deleted.

The net delta: +1 line.

Sponsored by: Netflix
sys/contrib/dev/acpica/components/debugger/dbcmds.c