Date: Wed, 22 Mar 2023 08:55:24 +0100 From: Warner Losh <imp@bsdimp.com> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: John Baldwin <jhb@freebsd.org>, Enji Cooper <ngie@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org> Subject: Re: git: f874e59ffcd8..3c320f4e5ee3 - vendor/openssl - vendor branch updated Message-ID: <CANCZdfoUJLOkR5=%2BH1WQJnpbaO14OP9o84iBu=eiNqWr3Sk5Aw@mail.gmail.com> In-Reply-To: <ZBqgXECZ4QPl96Z/@FreeBSD.org> References: <202303010230.3212UaBn013749@gitrepo.freebsd.org> <c9dfbc09-b488-66f6-9aa1-a15cbed8ff88@FreeBSD.org> <ZBqgXECZ4QPl96Z/@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000002f32bd05f7787c7d Content-Type: text/plain; charset="UTF-8" On Wed, Mar 22, 2023, 7:29 AM Alexey Dokuchaev <danfe@freebsd.org> wrote: > On Tue, Mar 07, 2023 at 09:50:36AM -0800, John Baldwin wrote: > > On 2/28/23 6:30 PM, Enji Cooper wrote: > > > The branch vendor/openssl has been updated by ngie: > > > > > > URL: https://cgit.FreeBSD.org/src/log/?id=f874e59ffcd8..3c320f4e5ee3 > > > > > > aba33b365925 Import OpenSSL 1.1.1s > > > 3c320f4e5ee3 Import OpenSSL 1.1.1t > > > > Why did you re-import these releases without coordinating with jkim@? > > > > He already imported these into the existing vendor/openssl-1.1.1 branch, > > 1.1.1s back in November, and 1.1.1t on Feb 7th (less than a month ago). > > Hey John, Enji, > > So what had happened here, and how do we prevent this from happening? > Is it possible to prune bogus re-imports from the repo? Did I miss a > reply or it went through the cracks? > The imported stuff is fine. Less than ideal, but not at all fatal since we haven't had a 3.x import yet. Several people chatted about this on irc and the consensus was not to fix and 3.x should be imported on the openssl branch before we merge to main. As for the other coordination I'm unsure what's going on and would love an update. Warner Warner > --0000000000002f32bd05f7787c7d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto"><div><br><br><div class=3D"gmail_quote"><div dir=3D"ltr" = class=3D"gmail_attr">On Wed, Mar 22, 2023, 7:29 AM Alexey Dokuchaev <<a = href=3D"mailto:danfe@freebsd.org">danfe@freebsd.org</a>> wrote:<br></div= ><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1= px #ccc solid;padding-left:1ex">On Tue, Mar 07, 2023 at 09:50:36AM -0800, J= ohn Baldwin wrote:<br> > On 2/28/23 6:30 PM, Enji Cooper wrote:<br> > > The branch vendor/openssl has been updated by ngie:<br> > > <br> > > URL: <a href=3D"https://cgit.FreeBSD.org/src/log/?id=3Df874e59ffc= d8..3c320f4e5ee3" rel=3D"noreferrer noreferrer" target=3D"_blank">https://c= git.FreeBSD.org/src/log/?id=3Df874e59ffcd8..3c320f4e5ee3</a><br> > > <br> > > aba33b365925 Import OpenSSL 1.1.1s<br> > > 3c320f4e5ee3 Import OpenSSL 1.1.1t<br> > <br> > Why did you re-import these releases without coordinating with jkim@?<= br> > <br> > He already imported these into the existing vendor/openssl-1.1.1 branc= h,<br> > 1.1.1s back in November, and 1.1.1t on Feb 7th (less than a month ago)= .<br> <br> Hey John, Enji,<br> <br> So what had happened here, and how do we prevent this from happening?<br> Is it possible to prune bogus re-imports from the repo?=C2=A0 Did I miss a<= br> reply or it went through the cracks?<br></blockquote></div></div><div dir= =3D"auto"><br></div><div dir=3D"auto">The imported stuff is fine. Less than= ideal, but not at all fatal since we haven't had a 3.x import yet. Sev= eral people chatted about this on irc and the consensus was not to fix and = 3.x should be imported on the openssl branch before we merge to main.</div>= <div dir=3D"auto"><br></div><div dir=3D"auto">As for the other coordination= I'm unsure what's going on and would love an update.</div><div dir= =3D"auto"><br></div><div dir=3D"auto">Warner</div><div dir=3D"auto"><br></d= iv><div dir=3D"auto">Warner=C2=A0</div><div dir=3D"auto"><div class=3D"gmai= l_quote"><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;borde= r-left:1px #ccc solid;padding-left:1ex"> </blockquote></div></div></div> --0000000000002f32bd05f7787c7d--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoUJLOkR5=%2BH1WQJnpbaO14OP9o84iBu=eiNqWr3Sk5Aw>