From nobody Wed Jan 25 18:36:59 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 4P2CHH69Kvz3b75V; Wed, 25 Jan 2023 18:36:59 +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 4P2CHH5k5Jz3Qn1; Wed, 25 Jan 2023 18:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674671819; 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=in7YjloS0HKi3ikqo67DqZWWA/JMuMMG+x0k4KJpqhE=; b=UnOGkvBYwsk7hKQxZsJo+H6pAX5qoceEG4s7Eknp7Y10+0r1ojFuKbxe5mflyIs1H63CkL YLqoV4Bf8tImIXlhocBTQUjQeQQ38nXYbJjFdEIRjCmyjZSA7CARR+e7QncoYHCuE+JkWf ydUNVcVK0embKU4/05MYppAvAB6ScEIWQC4cpFtr4QLOuvVKsslUPbG5amR45/QO297oPs e/nOhhfWN0dn/9tCWKyzPmWv2i56+exCUDwmJuL89zyslmsghvyrwfb3BYTbOMPza1Tmfo TxoUuzCeFbBa5gGesRAl5QbIRu00Lqi58XvD9JQtU1GqTj878AfV9Z11YZehWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674671819; 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=in7YjloS0HKi3ikqo67DqZWWA/JMuMMG+x0k4KJpqhE=; b=E/f00LiS96YHicRA6ybNWfYS/jIk8O0jQt6JESoPPUSJLHRkrwKG6IGi0lLm/7RXgDZYb8 AxKqmIYSn8ijoIUKUM6m9mocaweblvm/Uf57deGxU+uQ7z8PQveeP/cQYIhb4v8DmF+A1p 1GHKfBB/FwhW9caQr4JxyGHb4D/mY0l1vb4n4FWJEt9SMOHOZKAtxro4k9eEtMFgcXHdJi TUWK8hPwwOMBiuGVdWZLzasy2Drr4E7N+5RoR6sjKU8HDNj6vq/EqTxzXLsjn4+Hu3nqO7 ffviq4npUx2hsE/CMYVsEkHC4VZmWQ+yLsIrs9OZspz98PG+EFJrxlvwDyby1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674671819; a=rsa-sha256; cv=none; b=WSpXMpn327XjhWYodRFwmEi+ICnaPmDtTVmRPrVZoDpqHouwRDqkh67ekUFFUMlFAqlJO6 pd2sF53I69sh68VT8H7vN8YoLuURCDDq6U6r/5eSPYEOijrNFZcYyp9AwgB0JLjUbv49Pu Ugk0v5J5iZV5CgKjaGe3WV/bQDdZTOb/IZtxto8lGS9sipMzm1C847rNpRhmNzMF9lF8T0 YpjtH014+7lHa6IDohRMHCqSwjYLbLKFpWdEuvlo/e674661Xt8DmIiYORDVH1mV9G2M9Z Kq2KeBZ6+9Bf5MML20gCjuXEAz3IiWvr9jk1anLXJ8WXbWyRCXVLXFr1KMEZyA== 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 4P2CHH4nCBz10Bd; Wed, 25 Jan 2023 18:36:59 +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 30PIax7Y047728; Wed, 25 Jan 2023 18:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PIaxg6047727; Wed, 25 Jan 2023 18:36:59 GMT (envelope-from git) Date: Wed, 25 Jan 2023 18:36:59 GMT Message-Id: <202301251836.30PIaxg6047727@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: 20840247bcdd - stable/13 - stand: updated MFC info. 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: 20840247bcddf99439ba6e7a224efb2edb8922b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=20840247bcddf99439ba6e7a224efb2edb8922b1 commit 20840247bcddf99439ba6e7a224efb2edb8922b1 Author: Warner Losh AuthorDate: 2023-01-25 18:26:44 +0000 Commit: Warner Losh CommitDate: 2023-01-25 18:26:44 +0000 stand: updated MFC info. This is a direct commit to stable/13 --- stand/mfc-notes.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/mfc-notes.txt b/stand/mfc-notes.txt index 3d9c15a10c92..89dca26af4d0 100644 --- a/stand/mfc-notes.txt +++ b/stand/mfc-notes.txt @@ -1,4 +1,4 @@ -Stand has been merged from main:4883f347f6ed. The following hashes can't be +Stand has been merged through main:4410e857965e. The following hashes can't be merged for the reasons listed. b366ee4868bc already merged with ZFS @@ -29,3 +29,7 @@ ed68931c3f9c geliboot: Use the multi-block functions for AES-XTS. 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 + +Also, BERI was removed with the permission of the originators since all that +hardware has been retired. +