From owner-svn-src-stable@freebsd.org Thu Mar 29 02:49:13 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FFB3F69E4A; Thu, 29 Mar 2018 02:49:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id F2B4D733AE; Thu, 29 Mar 2018 02:49:11 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with ESMTPA id 1NchfvGieYxCT1NcifOML3; Wed, 28 Mar 2018 20:49:10 -0600 X-Authority-Analysis: v=2.3 cv=cav8UELM c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=v2DPQv5-lfwA:10 a=6I5d2MoRAAAA:8 a=iKhvJSA4AAAA:8 a=YxBL1-UpAAAA:8 a=vlCS4KWOddv9HgzGylgA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=odh9cflL3HIXMm4fY7Wr:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id C936FC73; Wed, 28 Mar 2018 19:49:06 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id w2T2moDl007393; Wed, 28 Mar 2018 19:48:50 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id w2T2moNj007390; Wed, 28 Mar 2018 19:48:50 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201803290248.w2T2moNj007390@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Glen Barber cc: Eitan Adler , rgrimes@freebsd.org, src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org, FreeBSD Release Engineering Team Subject: Re: Mismerge at r330897 in stable/11, Audit report In-Reply-To: Message from Glen Barber of "Thu, 29 Mar 2018 02:26:26 -0000." <20180329022626.GP81123@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 28 Mar 2018 19:48:50 -0700 X-CMAE-Envelope: MS4wfGInpJcjaTpqINLTXFsKW9ybLj4FabckKX+7KCeoXKOFMl7EAXaNyxjEvVDmJJ+x7+NUdMR/kTOlj2/FnbwYffQegmU0ul6AQJFTKLqUSr028fjra/v0 pskKYQivpPvTNo00vLbSktNuWdsOPw1mtDOvpSuW17XV8/kVWaHWyB7JhX64b8gpSDxwGgiRvzClzswGHshKFc7D3NiA0ChEo4KLHGmjKiVe2a7M6mpi3e16 YDxxgNc+lroVoc+v7mR1yINuUIfQ7WNymteF25NtBErJ7Cg6ZHc6W16/CKWVs3aUxci0jvznlHW6akX//PDNkGoeWppaxb+nJho7fHvIdgRc/OtgXfXC/x/K kP0E3O4xj0TTPSwW7XRsQaT3ErXHh9AXVdBd1TKu0uz/wmM37sJxAIFpmMgRgyS5FEZFmnQ720TxrCqkWyp2l/ytWqSgPIlf3541FwPaTTjkbpMTH2E= X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2018 02:49:13 -0000 In message <20180329022626.GP81123@FreeBSD.org>, Glen Barber writes: > > --88pBQ1/6ie/nQzMF > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > On Wed, Mar 28, 2018 at 07:17:20PM -0700, Eitan Adler wrote: > > On 28 March 2018 at 19:04, Rodney W. Grimes > > wrote: > > >> On 28 March 2018 at 18:35, Rodney W. Grimes > > >> wrote: > > >> >> >> Hi! > > >> >> >> > > >> >> >> This part of the MFC is wrong: > > >> >> >> > > >> >> >> https://svnweb.freebsd.org/base/stable/11/sys/sys/random.h?limit= > _changes=3D0&r1=3D330897&r2=3D330896&pathrev=3D330897 > > >> > > > >> > Can we try to identify exactly what rXXXXXX that is a merge of? > > >> > > > >> >> >> Could you please MFC back the other random related changes too? = > Some > > >> >> >> of them made by cem@. > > >> >> >> > > >> >> >> On 3/14/18, Eitan Adler wrote: > > >> >> >>> Author: eadler > > >> >> >>> Date: Wed Mar 14 03:19:51 2018 > > >> >> >>> New Revision: 330897 > > >> >> >>> URL: https://svnweb.freebsd.org/changeset/base/330897 > > >> >> >>> > > >> >> >>> Log: > > >> >> >>> Partial merge of the SPDX changes > > >> >> >>> > > >> >> >>> These changes are incomplete but are making it difficult > > >> >> >>> to determine what other changes can/should be merged. > > >> >> >>> > > >> >> >>> No objections from: pfg > > >> >> >>> > > >> >> > Am I missing something? If this MFC was supposed to be of the SPDX > > >> >> > license tagging, why does it have any functional changes? > > >> >> > > > >> >> > Especially changes to random(4)? > > >> >> > > >> >> This was my failure. I only spot checked & compile-checked the diff > > >> >> since I expected all changes to be comments/SPDX. > > >> >> > > >> >> However, I must have gotten carried away and included a few too many > > >> >> revisions. Unfortunately some people have already merged fixes to my > > >> >> failure and thus this can't be reverted as is without also reverting > > >> >> those fixes. > > >> >> > > >> >> That said, I should do that since this commit message is utterly wr= > ong. > > >> > > > >> > We do not have to revert r330897, with what follows I think > > >> > we can easily find the revisions to revert from stable/11. > > >> > ... > > >> > > >> While we don't have to revert it I'd rather do so than have bogus hist= > ory. > > > > > > Reverting wont remove that history, thats a one way deal, > > > and I think if we revert the bogus merges with the wrong > > > history thats as good as its gona get. > > > > > >> > > >> >From a look it seems the following was also merged: > > >> r316370, r317095, r324394, and a few others. > > >> > > >> Is there a reason you don't want me to revert the changes? > > > > > > Repository churn is my main concern. > > > > > > It touches 6000+ files some of which have probably > > > been touched since. A very carefull pre commit > > > audit would need to be done. > > > > > > Then another commit to 6000+ files to put it back, > > > also needing a pre-commit audit. (Pretty easy now > > > that I have a filter.) > >=20 > > I'm actually using the same filter you pasted above to verify that my > > changes are only reverting said files. That said, while I'd prefer to > > revert, I'll defer to others if they have a differing opinion. > >=20 > >=20 > > Note that I won't have access my dev box after tomorrow for about a week. > >=20 > > IMHO, if you are going to be away for over a week while we're headed > directly into the 11.2 release cycle, revert the change. What you > committed is not what was intended, clearly, and the commit message does > not reflect what had happened (as you noted). > > Any disagreements on this decision should be directed to me specifically > in this case. Agreed however we must tread carefully. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.