From nobody Sat Aug 12 08:05:14 2023 X-Original-To: dev-commits-src-all@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 4RNCrk1FF8z4m7gC; Sat, 12 Aug 2023 08:05:26 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4RNCrj0dJTz4HmM; Sat, 12 Aug 2023 08:05:25 +0000 (UTC) (envelope-from mm@FreeBSD.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 213.133.107.7 is neither permitted nor denied by domain of mm@FreeBSD.org) smtp.mailfrom=mm@FreeBSD.org; dmarc=none Received: from sslproxy02.your-server.de ([78.47.166.47]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qUjcb-0006db-Gi; Sat, 12 Aug 2023 10:05:17 +0200 Received: from [88.207.13.9] (helo=[192.168.1.112]) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qUjcb-000IqM-7N; Sat, 12 Aug 2023 10:05:17 +0200 Message-ID: <99e9a56b-2a1f-19c6-6433-e4953eda9359@FreeBSD.org> Date: Sat, 12 Aug 2023 10:05:14 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs From: Martin Matuska To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202308100835.37A8ZFgc042543@gitrepo.freebsd.org> <7e4d1dc2-4583-4161-3201-1d6e95f0a6d2@FreeBSD.org> Content-Language: en-US In-Reply-To: <7e4d1dc2-4583-4161-3201-1d6e95f0a6d2@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Authenticated-Sender: martin@matuska.de X-Virus-Scanned: Clear (ClamAV 0.103.8/26998/Sat Aug 12 09:37:12 2023) X-Spamd-Result: default: False [-2.67 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.99)[-0.990]; NEURAL_HAM_SHORT(-0.58)[-0.583]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; BLOCKLISTDE_FAIL(0.00)[213.133.107.7:server fail,78.47.166.47:server fail]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[mm]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; HAS_X_AS(0.00)[] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RNCrj0dJTz4HmM 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 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 +0000 >>> Commit:     Martin Matuska >>> 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. >>