From nobody Wed Jan 25 04:46:01 2023 X-Original-To: dev-commits-src-branches@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 4P1rrV015Fz3bZVP; Wed, 25 Jan 2023 04:46:02 +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 4P1rrT6JNLz4M2l; Wed, 25 Jan 2023 04:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674621961; 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=CUpbWvdEoIPKee0tyK406gwnwHb3BF6iw+FdeVK2oso=; b=Me5INY3hPQ6T8JGpzbBFr1keGr7efdvnE0HlK9c3ICSKG2NTaoXgh0sHYMnD97gNHtVbTc UWeO35/P3hTEeKc0ARu93f3UI3MyTcYJ+wMCTqLV3Zse72PK6NXvYvOEmr5DNlFg2d09g+ 44Dq0iMwklYn4+WJ3iP+dGpuzxU1T/Cs18omeF3ZpWb3JqZz7oq44LZxD3i5+6XlPllNsW 5yy3/PGo6/6FlKOvm9n6n3w5jmA+Mkijww0QR1TTeCDtbfoCc7aAaL4+In0ybFhIiPpBx9 xpVqdeOOHZJWodDFRG7C5PDy64l2rMK3YnfOZ38Ldz5Rr2UN99sG4eW/H1LNbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674621961; 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=CUpbWvdEoIPKee0tyK406gwnwHb3BF6iw+FdeVK2oso=; b=vPZ6NnZK58jULG+WDGB8ReEmb+8CgVYtF2wxBAXwmlstaggGddMZd7EtIVN+xDFuB+7jj2 tFJN+LAFE+NViyDRD5z8ZT1lqz4gUfJa4C6O8NuSW0RwaZNYO1B+x5fsfiRukArPa2v336 Fw3Z+kVWfJW14v1XFGu3lm52LSVEPmLb/hW9kUphboAxcXUKOM+hvPagRec/bNHP7Nyu2b QRhGuGsxcjYoMBfQ2VnZxUQvtRrHFm5x66MB/yiinYT3+UVQ94L/ck8jtfNMKJcfYhma1f zGifBS9eVU63W1ZNeo30C1bt7PN853q+KTDqDj1ktWh3o+SaQfKVtYEca7oUPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674621961; a=rsa-sha256; cv=none; b=sbOLZg+6y3Ngye6HT5M9SzALzXmb+PTmT1h9xzaTvRPVDhipfOmQEEZDynB02BRJKKja8M aQBGEr/c0bJxYOhEWnVjueBtvc01W1Pc63bGa5YXlu2Smqttt+x/HdH7Tz70FIVKju5IiN Np1K0kI+e43v2eJxUPx6AQby6sCvXUxzSAh38d6+rVUJau/N5hXe+iqzZeJTJhplxsYe2C 9Xfai6HMxT0G4srQSASYiIQONMmXZM3x6JqC2zQz+NWpePwqdR+b7VLPU17BTiIQrRC87b ex8FxkNH+lDVHdwMnD9ip1oPx/EQVeMBysPOFzFqWZHPTUYprErQOx9fQ5qMEg== 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 4P1rrT4sXxzc1F; Wed, 25 Jan 2023 04:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30P4k1qt053432; Wed, 25 Jan 2023 04:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30P4k1MP053431; Wed, 25 Jan 2023 04:46:01 GMT (envelope-from git) Date: Wed, 25 Jan 2023 04:46:01 GMT Message-Id: <202301250446.30P4k1MP053431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a72d533769ec - stable/13 - stand: mfc notes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a72d533769ecd68c6408e508785edf717ceb5b33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a72d533769ecd68c6408e508785edf717ceb5b33 commit a72d533769ecd68c6408e508785edf717ceb5b33 Author: Warner Losh AuthorDate: 2023-01-25 04:19:48 +0000 Commit: Warner Losh CommitDate: 2023-01-25 04:40:22 +0000 stand: mfc notes MFCing stand is getting complicated. This file contains notes about merging from 14, in summary: o UFS changes have already been merged. o The ZFS changes, on the whole, cannot be merged because OpenZFS versions are different. o MIPS is still present in 13, so commits to tear down mips support. o Some of the 14 GELI changes depend on crypto changes not yet merged. o One change bumped the version to 14.x, and that shouldn't be merged. The hashes listed should not be merged, unless something changes. This is a direct commit to stable/13. --- stand/mfc-notes.txt | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/stand/mfc-notes.txt b/stand/mfc-notes.txt new file mode 100644 index 000000000000..3d9c15a10c92 --- /dev/null +++ b/stand/mfc-notes.txt @@ -0,0 +1,31 @@ +Stand has been merged from main:4883f347f6ed. The following hashes can't be +merged for the reasons listed. + +b366ee4868bc already merged with ZFS +6f6fbfa3a835 too damn much in one commit, skipping +c03c5b1c8091 OpenZFS merge... so not relevant +e3aa18ad7178 OpenZFS merge... so not relevant +285f6ab665d7 zstd is different in stable/13, so not relevant +0e5ac0ad0384 zstd is different in stable/13, so not relevant +451ac17a5030 zstd is different in stable/13, so not relevant (though marginal) +119c786f7b5a zstd is different in stable/13, so not relevant but kinda desirable (check agian?) +75ad24775b68 blake3 -- not merging +4773d3425e62 comments conflict, I'm not sorting that out +d1fb0e1dc8ec applied accidentally because this restores a backout that was skipped +09ace5cefbd2 ZFS flag limiting depends on newer OpenZFS so not merged +1306a5dc0747 Standard ZFS_EARLY stuff depends on other things, so not merged +16ebddc9a72a comment about blake3 depends on blake3 supprot, which wasn't merged +b21582ee03ec ufs changes kirk already merged +4f0c9b76cf75 Depends on newer OpenZFS +e68866164212 UFS changes from Kirk... he merged the separately +6d645da0d49d also merged by kirk +c7046f76c2c0 blake workarounds merged +f993fff68979 sorting these is useless to merge if the lists aren't already the same +8a744de27eef let's leave firewire in place +0163de282e31 These depend on newer OpenZFS so not needed and conflicts +ed68931c3f9c geliboot: Use the multi-block functions for AES-XTS. +399b56c46c1c stand: delete zstd_shim.c -- dependent changes nor merged 119c786f7b5a +03bbe1845de7 mips is still in stable/13 +20b23ae74b2b mips is still in stable/13 +8cc2156f85bb We're not 14, yet +44796b7e822e beri uses this, it seems, and is still in stable/13