git: a72d533769ec - stable/13 - stand: mfc notes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Jan 2023 04:46:01 UTC
The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a72d533769ecd68c6408e508785edf717ceb5b33 commit a72d533769ecd68c6408e508785edf717ceb5b33 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2023-01-25 04:19:48 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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