Date: Sat, 12 Aug 2023 10:05:14 +0200 From: Martin Matuska <mm@FreeBSD.org> To: Mateusz Guzik <mjguzik@gmail.com> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs Message-ID: <99e9a56b-2a1f-19c6-6433-e4953eda9359@FreeBSD.org> In-Reply-To: <7e4d1dc2-4583-4161-3201-1d6e95f0a6d2@FreeBSD.org> References: <202308100835.37A8ZFgc042543@gitrepo.freebsd.org> <CAGudoHHFN0dxwUU919frc%2BDYOFWfHFXAUtckvY8cHL6s3B_ksA@mail.gmail.com> <7e4d1dc2-4583-4161-3201-1d6e95f0a6d2@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 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 that fix > serious issues > everything else will make the merge management unnecessarily complicated. > > Cheers, > mm > > On 10. 8. 2023 16:23, Mateusz Guzik wrote: >> On 8/10/23, Martin Matuska <mm@freebsd.org> wrote: >>> The branch main has been updated by mm: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=cd25b0f740f8c846562fd66e7380437eb898c875 >>> >>> >>> commit cd25b0f740f8c846562fd66e7380437eb898c875 >>> Author: Martin Matuska <mm@FreeBSD.org> >>> AuthorDate: 2023-08-10 07:55:42 +0000 >>> Commit: Martin Matuska <mm@FreeBSD.org> >>> CommitDate: 2023-08-10 07:56:53 +0000 >>> >>> zfs: cherry-pick fix from openzfs >>> >>> Vendor PR: >>> #15080 ZIL: Fix config lock deadlock >>> >>> Obtained from: OpenZFS >>> OpenZFS commit: 2cb992a99ccadb78d97049b40bd442eb4fdc549d >>> >>> Note: full vendor imports will continue when stable/14 has been >>> branched >> First a stylistic issue: >> Can you please use upstream one-liner, maybe prefixed with zfs:. For >> this commit it would be: >> zfs: ZIL: Fix config lock deadlock. >> >> then copy their commit message >> >> For example see >> https://cgit.freebsd.org/src/commit/?id=d09a955a605d03471c5ab7bd17b8a6186fdc148c >> >> >> A not stylistic issue is the delay between upstream fixes and them >> getting merged into FreeBSD. For example the commit at hand is over 2 >> weeks old and I presume this merge got only prompted by des@ running a >> zfs-related deadlock. >> >> We really should be getting timely updates without local people >> running into them. >>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?99e9a56b-2a1f-19c6-6433-e4953eda9359>