Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs

2023-08-12 Thread Martin Matuska
If there are any cherry-pick candidates from OpenZFS that have been already merged to zfs-2.2-release and fix serious bugs please report them to me so I can include them before stable/14 gets branched. Thanks, mm On 10. 8. 2023 17:55, Martin Matuska wrote: Hi Mateusz, I am very sorry but we

Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs

2023-08-10 Thread Martin Matuska
Hi Mateusz, I am very sorry but we have to wait with full merges until 14-stable is branched. After branching: main will continue to receive updates from OpenZFS master branch stable/14 will be updated from OpenZFS zfs-2.2-release branch Until then everything we can do is cherry-pick commits

Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs

2023-08-10 Thread Mateusz Guzik
On 8/10/23, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=cd25b0f740f8c846562fd66e7380437eb898c875 > > commit cd25b0f740f8c846562fd66e7380437eb898c875 > Author: Martin Matuska > AuthorDate: 2023-08-10 07:55:42 + > Commit