From owner-svn-src-all@freebsd.org Thu Mar 29 02:22:45 2018 Return-Path: Delivered-To: svn-src-all@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 509E2F66BBA for ; Thu, 29 Mar 2018 02:22:45 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yb0-x230.google.com (mail-yb0-x230.google.com [IPv6:2607:f8b0:4002:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA73571C11 for ; Thu, 29 Mar 2018 02:22:44 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yb0-x230.google.com with SMTP id k199-v6so1500966ybk.12 for ; Wed, 28 Mar 2018 19:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=oKUDrtD72OR8uegWZzGreVIRtZbPYX2drn/2k3f8dLs=; b=NoUvhepobkTQJYXjVOznXI/J2dCQgDrgQeeqvcK2JF2eEDu+1v1evCnZAmYCiz0lDI UFsp90sa+Mhe4CKYct9QdYFdokrCC8eIMVxvB5JjoEpp+sopzI6owtlBYrQhvfcH4HuY oyJ08S2Rbxt618Rd7PtzqNm/dDXj763uxRigM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=oKUDrtD72OR8uegWZzGreVIRtZbPYX2drn/2k3f8dLs=; b=a22foxaqzCNSlV+ZUSqucDx1PQFPugj6uocbwwyKJl99yJ5W8aQ5P2rTvGeNz+fOaF SxAFqP/p2xcKAG34Xkr2Em2xuuefKyqjPeCnda1tiW/HqDZG2PDikyDLMZz/clXVdb5b Gnh4wPjIyP0nso8OctyX4yjo58+TO9ZWnp61/bo6HSCOhG7U2r8/gCDuaFx3TwSzd7tT CFWC4aMfoIKtehzOAxgsE2hM2DqIubL/K/K2iTsAqY5TeExZ/N+48sbMKf+H6NC13XW7 7OKUQhBUdJnnnQS7Ndad0lpQerL/5uC7BwX5eEL2Rp4cvsjIz8dmVptdHMnI7A2VzPN0 GMSA== X-Gm-Message-State: AElRT7F3Ibc50GCh1HbGpXt30tpjFxMssbklVYPH25Gukp2qNXpVWB2x IWgsjb1OBAylp7hnGKrHICDe6B6ZQRLJR/va05X0Wg== X-Google-Smtp-Source: AIpwx4999XsF1dTm7Xl2CiwY6dQxk3uq0Kh0o0L4qqQdfzJ1dW3wHKzE6/Dr3CNwB/TFph66J1ruN8aDB7IW/gkdQFk= X-Received: by 2002:a25:268f:: with SMTP id m137-v6mr3664252ybm.460.1522290164330; Wed, 28 Mar 2018 19:22:44 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 2002:a5b:990:0:0:0:0:0 with HTTP; Wed, 28 Mar 2018 19:22:13 -0700 (PDT) In-Reply-To: References: <201803290204.w2T24foA060205@pdx.rh.CN85.dnsmgr.net> From: Eitan Adler Date: Wed, 28 Mar 2018 19:22:13 -0700 X-Google-Sender-Auth: KsrC0ULo2h4bAXkQax9TEYFO098 Message-ID: Subject: Re: Mismerge at r330897 in stable/11, Audit report To: rgrimes@freebsd.org Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org, FreeBSD Release Engineering Team Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2018 02:22:45 -0000 On 28 March 2018 at 19:17, 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=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 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.) > > 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. Someone else mentioned out of band to not revert as well. Since this seems to be the consensus I'll go with that. Let me merge the missing commits that op mentioned. Once again, sorry all :( -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams