Date: Wed, 25 Jan 2023 18:36:59 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 20840247bcdd - stable/13 - stand: updated MFC info. Message-ID: <202301251836.30PIaxg6047727@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=20840247bcddf99439ba6e7a224efb2edb8922b1 commit 20840247bcddf99439ba6e7a224efb2edb8922b1 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2023-01-25 18:26:44 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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. +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301251836.30PIaxg6047727>