From owner-svn-src-stable@freebsd.org Thu Mar 29 01:53:53 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 EFA6FF637D5 for ; Thu, 29 Mar 2018 01:53:52 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yb0-x236.google.com (mail-yb0-x236.google.com [IPv6:2607:f8b0:4002:c09::236]) (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 8D52C70326 for ; Thu, 29 Mar 2018 01:53:52 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yb0-x236.google.com with SMTP id b4-v6so1495626ybi.0 for ; Wed, 28 Mar 2018 18:53:52 -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=b6SJyyfjDrT6hVQ/L1rI9IYLFwd+/eyg1fstZ2h/kKc=; b=d1ltj6DzqHJjchMaKbSl2nVwChadwTKkvaWUtbvFWu+DwgA5dZSkKOIhP5yAQmaTcl 2mglTbntTkfJiZF6HNLO/k77yH7/hvD5F0aCSnWHgLdNXq1LPIhlWb3Wa6Qm6vMSRNXX JVnVixrQ0/SomRGOw11SZbFCr4Q4BYp16GZSQ= 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=b6SJyyfjDrT6hVQ/L1rI9IYLFwd+/eyg1fstZ2h/kKc=; b=cY8awpB/6bG2nJzR/nlOBd2rMnNTwCXZzxMptSL5TOQ9VISOfsYGcxqaF3/BCUUSk/ ebJ1QocokQ1jJBbxK0cHa9gGHaXk5YIBuk+tHWhKWwesXQ8wg20Uxz98r9SIVyY8VJwE R9MXZshgXjAdn9UOOk6SwFGvTQaMlBfCvxlqHyKTy6XIZ8JK7LWCLcrqbHk1caIEV6A+ mM16usbv/yglZ6iXxwO6IP0y93pYWeplqQzN5xx9ufilQWoMSqqgOySHkePF3KvL+wxF 1fs5EBZTVlySuAGwiVwEjwuCzXlMq4juGbxlpvaEkWTRM3flYYGwGuQH58p1PGfJ/rto cOew== X-Gm-Message-State: AElRT7GOA5+PA4Ufz5mGIqWB2M4wwbn/dN22YfefZ1Bk+sUVBvDa5+Q6 98o+RVUSa/TFN5pyHW47f8sCE8LzIslSu806H0GjVw== X-Google-Smtp-Source: AIpwx48wCDW3YMDfihpXMfKdmCL2ttuMfhHY0o4ndy15As6NFcoINAroqZJRwUOXNvEYQmvLz5GAlbWFnH6r6dBoEII= X-Received: by 2002:a25:d213:: with SMTP id j19-v6mr3760738ybg.338.1522288431635; Wed, 28 Mar 2018 18:53:51 -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 18:53:21 -0700 (PDT) In-Reply-To: <201803290135.w2T1Z7hU060080@pdx.rh.CN85.dnsmgr.net> References: <201803290135.w2T1Z7hU060080@pdx.rh.CN85.dnsmgr.net> From: Eitan Adler Date: Wed, 28 Mar 2018 18:53:21 -0700 X-Google-Sender-Auth: FNFLSY7U9_SkMjY_v9J4Jy7Qq6U 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-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 01:53:53 -0000 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. >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? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams