From nobody Wed Feb 7 05:50:56 2024 X-Original-To: dev-commits-src-main@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 4TV8Nw75GWz58rCR; Wed, 7 Feb 2024 05:50:56 +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 4TV8Nw6FyJz4ZNV; Wed, 7 Feb 2024 05:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707285056; 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=ZpqcpXyrgJgEDNIJR9Fzu3D7q8+kSybqn4qAvK3VCLI=; b=BKlN6WZ9+Z/IYLSolgrc5RfHXr3yGiLwjafEgczQtOKngc7r4OPduKtSZxTwdOk62aepn/ nAkTAsFPZMecWJWC9n3VBNKez0QXAhxH1KswTH5uo5qFlBAhfnC8D8H0Nz6WoMcIHjv4UI hL9VXi50BJVI4KuD4x1YEN8+4zOIG4nR0z39iO7GUhdMGaJSnAiG6pfNrsKxOhCTx7vm5w nC115C+AczVaK7R9SQgHGA32UaoxKMhTuu1x4almZ6tFe6Q4R7QDf69tAtKUpI5it0eRr3 qFX+dISWcEiYhqu2LY2A2+DJAVajox4kg6v5gBY5ekOE7olp9pcoulNLpQQyng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707285056; 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=ZpqcpXyrgJgEDNIJR9Fzu3D7q8+kSybqn4qAvK3VCLI=; b=IPxk6JiNuSkmXJHTi9gla4fQFqhq7qiZ4pheDW6o1+zWKAUU2shCMb5pqJhqmAf23PVZ1m pThYCLnSjH94ctCILg8WPukyLcJkXbLW4nnlDVPJIm3JVBOZWUoWlVYsGTDlF/YrwCQ2Or hS530a+mP5/4lmTFYrbWdmy1cVaKWpy5aPaWViintNnpeEiia0hsSqulgjRcYfvLw6lbX4 9s2hXfccMbKLXLP4NGG4Qb2RslSnj0PkJVGgdt+HHAaHUf1SZVOIpigKSeO19+wNDwm7fK t6yWdSH2wnC8akr+CtulxXoDct0G1gMJm9Aqi8oHp1asdsGVYY8/zAvJvNgKDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707285056; a=rsa-sha256; cv=none; b=K+fiDB7ShcBXx2+rq/P47Kjk6N0Fjx+cuUj7NvJ89c3w9ucHn9dU/m1eGe0kZwpXSt0zM4 wsD3wa0N05lnWsy9KtpXSMs3HxE7tnKo6YAoWzyutS8fFQQ7P6rg4S0iTwA90LDD79Z5hS 14MeyjNz/qrnelHIq9qw77v3t+OkITdKFesd9DR/Sonczk4HkF1RO2vxfFAtGerFORYHPy NNZ0PuDrZq8Eriejem5Pj2/w8bRoQd6KeMwqtzlRjeYwqH/OtIgkHOpsi1D0HhqzGnrKra z5j/wxS2LvO/MV71RdWu1ig3UrGkAF+Ji/cfw05C/gfXfDHJG1MD7UmdWv23TA== 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 4TV8Nw5KDqztw8; Wed, 7 Feb 2024 05:50:56 +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 4175oueV022189; Wed, 7 Feb 2024 05:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4175oufj022186; Wed, 7 Feb 2024 05:50:56 GMT (envelope-from git) Date: Wed, 7 Feb 2024 05:50:56 GMT Message-Id: <202402070550.4175oufj022186@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: f1e8d3361b94 - main - acpica: Fix my mismerge List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f1e8d3361b944a46f514c7d44330a5f2c0b62a1c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e8d3361b944a46f514c7d44330a5f2c0b62a1c commit f1e8d3361b944a46f514c7d44330a5f2c0b62a1c Author: Warner Losh AuthorDate: 2024-02-07 05:47:42 +0000 Commit: Warner Losh CommitDate: 2024-02-07 05:47:42 +0000 acpica: Fix my mismerge I merged in the limits.h include. I should have resolved this by deleting it (since we have no easy way to 'fix' it with compat headers). GENERIC doesn't bring in the debugger, but LINT does... Sponsored by: Netflix --- sys/contrib/dev/acpica/components/debugger/dbcmds.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/contrib/dev/acpica/components/debugger/dbcmds.c b/sys/contrib/dev/acpica/components/debugger/dbcmds.c index 74263a01dc9f..4c8f091f126c 100644 --- a/sys/contrib/dev/acpica/components/debugger/dbcmds.c +++ b/sys/contrib/dev/acpica/components/debugger/dbcmds.c @@ -156,7 +156,6 @@ #include #include #include -#include "limits.h" #define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbcmds")