Date: Mon, 27 Feb 2023 15:04:41 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Colin Percival <cperciva@tarsnap.com>, Zhenlei Huang <zlei@FreeBSD.org> Cc: Cy Schubert <cy@freebsd.org>, "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-branches@freebsd.org" <dev-commits-src-branches@FreeBSD.org>, re@freebsd.org Subject: Re: git: 26ba9518ffec - stable/13 - unbound: Vendor import 1.17.1 Message-ID: <20230227230441.AA198C9@slippy.cwsent.com> In-Reply-To: <20230227040559.2CCD6658@slippy.cwsent.com> References: <202302141833.31EIXkwO001829@gitrepo.freebsd.org> <2AFA7DFF-388C-4C6C-8CF3-9B9FAC95BF14@FreeBSD.org> <AE2921D4-4851-4100-A7DA-C6A8F765BD3B@cschubert.com> <010001868ffe0ff1-0859a410-c83d-4924-9ecf-23ddbb2aeb67-000000@email.amazonses.com> <20230227040559.2CCD6658@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <20230227040559.2CCD6658@slippy.cwsent.com>, Cy Schubert writes: > In message <010001868ffe0ff1-0859a410-c83d-4924-9ecf-23ddbb2aeb67-000000@ema > il. > amazonses.com>, Colin Percival writes: > > On 2/26/23 10:20, Cy Schubert wrote: > > > On February 25, 2023 10:45:37 PM PST, Zhenlei Huang <zlei@FreeBSD.org> wr > ot > > e: > > >> Will this been merged into releng/13.2 ? > > >> > > >> RC1 is coming, as per the release schedule https://www.freebsd.org/relea > se > > s/13.2R/schedule/ <https://www.freebsd.org/releases/13.2R/schedule/>; . > > >> > > >>> On Feb 15, 2023, at 2:33 AM, Cy Schubert <cy@freebsd.org> wrote: > > >>> unbound: Vendor import 1.17.1 > > > > > > We will need to as the Release Engineer, as MFS to releng/13.2 is not my > de > > cision. > > > > In general yes, it's better to have newer versions of "contrib" code in the > > release -- among other things, it makes it easier for secteam to handle any > > security vulnerabilities. > > > > That said, I haven't looked at what has changed in this version; if there's > > some reason you don't think it should be merged, I'll absolutely trust your > > expertise here. > > > > So I'm not going to ask for this to be merged to releng/13.2, but if you'd > > like to do it (in the next few days!) I think it's safe to say that you can > > expect it to be approved. ;-) > > I'll make a formal request first thing tomorrow morning. Having looked at this, this afternoon (unexpectedly crazy in a bad sense morning), this would be an MFS of three separate commits to releng/13.2. I was toying with the idea of a squashed commit but I think a squashed commit would could confuse the cherry-picked lines. I'll try to get it an approval email sent to re@ as soon as I can. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230227230441.AA198C9>