From nobody Thu Dec 12 17:38:46 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 4Y8KT24YyBz5gXkV; Thu, 12 Dec 2024 17:38:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8KT243Xjz4t7Q; Thu, 12 Dec 2024 17:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734025126; 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=fVNMN1121aR9PQFgFAt3aPQ0NKNGQ8PvvoVO9XOErFA=; b=CqswI/amDagvwrUDqTonOsqA5Fo86hHyx/rnOOMTrD00MPKGlJH08JWmy/ry26C04Z8Dv6 z2phuQc0L1h8YY/VpQ5V80n7FErOgAARSO24vWXP3FocLi302XoWxus9o8MgKL90iV1JLN nVN5j5OQ5L5NaNHGosGv6k11zEnOFievCFGlclLhL6+yatsR9J2f7ivCU/ATKvaURBMe7j F4h3ZAv72wImhE3EmqU+8/LOUzgrKYzDjHgL2q/baHgPS9+QPiAAz/TPX5z5cZh3BrTBV7 3tMzu17tGv4zJ9TtrtxDfx+eOAeuxyZ0JseM/8s+QzE97OFNkM8KaPbJyTm7uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734025126; 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=fVNMN1121aR9PQFgFAt3aPQ0NKNGQ8PvvoVO9XOErFA=; b=e4mHxHotZ39+bKk7kDWPgpz4WPh1i+jIbsvCad076v8XUeTrdw9iRsxUI8kq1VaWPkoDcu mVjsGZs0kYxr4QcbtXacoKsHZrmupA3ZwoTkMQnKPp785UL2ERW80hnhjLUwgIyp7jo4zA KyBMFP0XWGq2ONocg7Hr/O9lIpR3mFJYZ+Jh3cLr7lLjJZd22b4Zh9BmnMFaNZ47SsJ7mo q4FWR6FOgqsBJvpjSU+InixZVSKEY35rl7vRxbXxFgUylZBirmiMvVmen5eZRM/cGtjvWo x1WnvNwbn1RzR8UTs8SJarYS5pYLW1ySPdFgSkpCOHgoRDyCGOcilOlbYa2D3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734025126; a=rsa-sha256; cv=none; b=NLB7jjzxfhtz7Ggm81m5WrLDebtSVawQbHcrR401lZ8NmgVJSrGC2oW1WHeTopYPAKtJyF 3SF6d39fM4fwCbVxhyMr5Ag9/BA+EOw1hxmvxDgN5srb1LF3kgbiNV3kO3njoY3pco3MxX Cw3+RAx1aye5j55ngjKSKFggozdJe6u8KjHFU1zK8R/7PngZUO5Zj5Xjs9MsCodQbj+OJo o0EkM3He4wWiz33CaW2m5fIygHegwO54J+ZgHd17+sgATDzzpsWrQyP5MOTKAFb6MI0j1j PicfvViJ/w82B0ez4P5i4p2D8fZ9Yh9EiiSwvIz7sML9vzCLQtYySg0/NhNQHQ== 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 4Y8KT23XWKz12SH; Thu, 12 Dec 2024 17:38:46 +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 4BCHckC3022075; Thu, 12 Dec 2024 17:38:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCHckNx022072; Thu, 12 Dec 2024 17:38:46 GMT (envelope-from git) Date: Thu, 12 Dec 2024 17:38:46 GMT Message-Id: <202412121738.4BCHckNx022072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 397a3893db1d - stable/14 - depend-cleanup.sh: fix dependency changes from latest OpenZFS import 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 397a3893db1dabd9497e6324ba6afb489fbca037 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=397a3893db1dabd9497e6324ba6afb489fbca037 commit 397a3893db1dabd9497e6324ba6afb489fbca037 Author: Martin Matuska AuthorDate: 2024-12-12 17:23:55 +0000 Commit: Martin Matuska CommitDate: 2024-12-12 17:29:09 +0000 depend-cleanup.sh: fix dependency changes from latest OpenZFS import Backports fd3d3240b, 0980d0a03, 7a7741af18d (partial), 73c7cb57a --- tools/build/depend-cleanup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 7441cd1d7d81..a4d367d7c463 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -176,3 +176,8 @@ if [ -e "$f" ]; then run rm -f "$p"/*.inc fi fi + +# 20241212 2ec8b6948070 zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 +clean_dep cddl/lib/libzpool abd_os c "linux/zfs/abd_os\.c" +clean_dep cddl/lib/libzpool arc_os c "linux/zfs/arc_os\.c" +clean_dep cddl/lib/libzpool zfs_debug c "linux/zfs/zfs_debug\.c"