git: a841e5470385 - main - acpica: Create merge commit against vendor branch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Feb 2024 22:19:51 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a841e5470385fa62fa65d6de5bcba33afdbf42ea commit a841e5470385fa62fa65d6de5bcba33afdbf42ea Merge: 6d4a140acfdf ef3ba9d62592 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-02-05 22:13:57 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-02-05 22:17:02 +0000 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 | 1 + 1 file changed, 1 insertion(+) diff --cc sys/contrib/dev/acpica/components/debugger/dbcmds.c index 4c8f091f126c,6636f7b9736c..74263a01dc9f --- a/sys/contrib/dev/acpica/components/debugger/dbcmds.c +++ b/sys/contrib/dev/acpica/components/debugger/dbcmds.c @@@ -149,13 -149,14 +149,14 @@@ * *****************************************************************************/ -#include "acpi.h" -#include "accommon.h" -#include "acevents.h" -#include "acdebug.h" -#include "acnamesp.h" -#include "acresrc.h" -#include "actables.h" +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> +#include <contrib/dev/acpica/include/acevents.h> +#include <contrib/dev/acpica/include/acdebug.h> +#include <contrib/dev/acpica/include/acnamesp.h> +#include <contrib/dev/acpica/include/acresrc.h> +#include <contrib/dev/acpica/include/actables.h> + #include "limits.h" #define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbcmds")