From nobody Sat Jul 20 04:22:47 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 4WQtgX1CtTz5R5wW; Sat, 20 Jul 2024 04:22:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WQtgX0c2yz4Fx9; Sat, 20 Jul 2024 04:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721449368; 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=VOvyiFQB0ucSwmJNf3H6/KFep0EaXXvXZhpTVrUby/E=; b=NEvwJTsdiysS19wnpFl3R091NoWvOg7tvhJSuhVZjmTv/C9lXqZqvk0BOWhVMcpDegr9on HFqmblHsNBMd3URg/mYKx+zbqVOr0Acuri7qu5yXvTHBr1yZ8ClgM1m9YhcwNQqOYIs0iv Ri493zStnH1uI/yqUZoTSBZqTFzwikCqtqWM9z8roTHfabvRL3IB6vU/TlLOlMnu9EXF5c 8CgJbR6lJk83e8oADEwPJCVNufwWKfkwtt7vVKzBBqDGmNckLZjHDh0KBZ/vZchDAmV+mb L80uuKJdQubXqqRz1JzlzQO/xtfWmoOxZtByHuoVlfP+pHcdP2SmYn53omM8oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721449368; a=rsa-sha256; cv=none; b=YKmNioeyjA0spELtwQOaP3EYgC5df9nZqmRTpxRXqAd5L8VQxrZDNpXcyzP9AdHxmYrTv3 8erL8yDlZOB96aMPF2V7Ojgs5y/ekDwdbHOJKHux0dM8KfLjmqelGmCLOlBa8NWdYZpnK5 W+6PH8KIyrPN0i1K9teisemFDbryfK9TTqmxcXo0Wt4udKieG3KxPiXqWfRM2XYZrCCm0a I0CGeO9fLxr2iW69OLkc2Wa43safJoAHcZCQDDyk6+/4WPhVHXx/wMH6Zyl6Gd6uj1qupJ dohGFsmMDkNBTorX+4XRf4Qo9Rs9HsD95aSiAU8CWYaUQ1FNgy/GcZxDinqgcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721449368; 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=VOvyiFQB0ucSwmJNf3H6/KFep0EaXXvXZhpTVrUby/E=; b=X2qDawHnoxja9haJOtRAkthLfe38NH4bF1SUx1YcREdEiQTuJdQDgLPqvN48+Eg8atVU6s +dPh0bFFLi0miVS6Suxp17Ef7Ul+cZbKfm48YdyXjXCSh/Zj/Fh/v1TQs40t8rRFU5OLXD Mh1u5OzYqKkG470HOawfYCoxba3Ur3VLNdaQ++gg06SZrQ297h+ZnC606EWLG+R48kj5Nc 4XWQKfwQ2X687ei+VHtWKWxx8sQQJ3/1k9ouVW7hdj62uDHRCTILu+qW9ZjV+H09elg3o5 92Z0HJl4oiByXvCufI3mzmqB/iiyKu4ORlKiw/JKua51F8l4jmsDFXSUCAiZjg== 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 4WQtgX0CfJz11q8; Sat, 20 Jul 2024 04:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46K4MlAq079424; Sat, 20 Jul 2024 04:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46K4Ml5C079421; Sat, 20 Jul 2024 04:22:47 GMT (envelope-from git) Date: Sat, 20 Jul 2024 04:22:47 GMT Message-Id: <202407200422.46K4Ml5C079421@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: 403cc016c07a - main - cam/iosched: Fix build 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 403cc016c07aada3ee0a578e484297df452b8bb3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=403cc016c07aada3ee0a578e484297df452b8bb3 commit 403cc016c07aada3ee0a578e484297df452b8bb3 Author: Warner Losh AuthorDate: 2024-07-20 04:16:59 +0000 Commit: Warner Losh CommitDate: 2024-07-20 04:16:59 +0000 cam/iosched: Fix build I was testing this in several trees, and this chunk was in the tree I tested. I didn't detect the mismerge before the commit... Fixes: 6f1dd6071a91 Sponsored by: Netflix --- sys/cam/cam_iosched.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 5f171e402ed2..4f4a2b2cde55 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -48,6 +48,8 @@ #include +#include + static MALLOC_DEFINE(M_CAMSCHED, "CAM I/O Scheduler", "CAM I/O Scheduler buffers");