Date: Wed, 28 Mar 2018 19:04:41 -0700 (PDT) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Eitan Adler <eadler@freebsd.org> Cc: rgrimes@freebsd.org, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org, FreeBSD Release Engineering Team <re@freebsd.org> Subject: Re: Mismerge at r330897 in stable/11, Audit report Message-ID: <201803290204.w2T24foA060205@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <CAF6rxgmkE-qDLA78wQX8zPOFMQqKO-SafKYA72hG1g_hB1rHug@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 28 March 2018 at 18:35, Rodney W. Grimes > <freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > >> >> Hi! > >> >> > >> >> This part of the MFC is wrong: > >> >> > >> >> https://svnweb.freebsd.org/base/stable/11/sys/sys/random.h?limit_changes=0&r1=330897&r2=330896&pathrev=330897 > > > > 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 <eadler@freebsd.org> 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 wrong. > > > > 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 history. 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.) -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803290204.w2T24foA060205>