From nobody Mon Feb 05 22:19:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TTLQv5Sxdz598Gs; Mon, 5 Feb 2024 22:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TTLQv4yPBz58HZ; Mon, 5 Feb 2024 22:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707171591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aSnpaxX9gFvL2CsUYyLk7JHp/JoHZW4SQn0RoV1hd38=; b=GCogt3EGXKqRxXePTKOceKmJBow82SZZK0qu11duOwLkGZBNX7jT9ILm+BEV6MOopOTuzu pRR90MJSbLGFZ8AiQoeiynpUk0JU3OGfAhBFhN8PyOUBhSP14SbMidkcq7Xtc/3kpGwL3Q 6rLGTOKfejWxkVrJwvq/4nMT1D72gG42efiDWJabD6JvmFYLqdZOEwMimNLTduLDSCP09D 2ayeOyt0AGUveo27zyVljwveanlT+gGQRIDELIoUukT6Ml2Ff1P0qj/GuY1paCJs8C9zII MvoP2TprUYOzP5hdSv36Eqk/BpxADLWHcu2KeMMlP0q9jEXwqftv+3dCY+tSYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707171591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aSnpaxX9gFvL2CsUYyLk7JHp/JoHZW4SQn0RoV1hd38=; b=sswlLC5c2UPbLlFlGuyTRcGareDJjbbaqa9D4cHaWQqs6Y9PoFLNisQ60h2tw2cZiKeFED ehFHPqz16030MJSGsZiifS9tGjvdwHUsDMUmgpbBeKgTDvgWDn0pa3kEq6vgHPRoqozU16 pcb8pXJOY+Kci7D1Jput7tXdgB7XM8w8H3KXAxFTyQqruAikA631z50tfe1Ss9rhM140xV oDcsuSg63KnjIBYRcVAaAnc6jXQxVidjJe/ROBGk32FJW6mEW4P+X5WbRYiswXQPpzuPzm UtLl51VHRMJCNpkgOcHftFcFfc0NpD+Z4iNQ40c0sU9dSeV11Gjq/cCDN2tv8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707171591; a=rsa-sha256; cv=none; b=gudR+YthxAjz9j5N09bSo/o720afnIfMOaXP/BQ3oqrw6lslVFerVnuMkmLQ1DuhZhtoKj H+TdbygoynyiC45vcGHgnG0tVYihHyvOOPPQ92XKE0dmZp6aWsBDJ2rsChgM9qZZnL373Y RVlXOX+5iGxao3rNgBF4FMDep/2eT9M6qmPeeIAquWphtsgciGmHGqyXAlFbeZ0CCV+th6 d1/ezpwpsM5dlq16vstXrFRMxSkwg21f0B/LUV+VhNQ9Y4PvTie7ZJVlI7voa6tIE8rYBL qW2QXcsq/tEk10GNB2byI1SYyFTHey4qDaqWfZeNtJU4mWTDr1fN+T8TYJjwvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TTLQv41sWzxRJ; Mon, 5 Feb 2024 22:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 415MJpnU038171; Mon, 5 Feb 2024 22:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415MJp7X038168; Mon, 5 Feb 2024 22:19:51 GMT (envelope-from git) Date: Mon, 5 Feb 2024 22:19:51 GMT Message-Id: <202402052219.415MJp7X038168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a841e5470385 - main - acpica: Create merge commit against vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a841e5470385fa62fa65d6de5bcba33afdbf42ea Auto-Submitted: auto-generated 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 AuthorDate: 2024-02-05 22:13:57 +0000 Commit: Warner Losh 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 +#include +#include +#include +#include +#include +#include + #include "limits.h" #define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbcmds")