From owner-svn-src-stable@freebsd.org Mon Apr 16 00:12:27 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 C4E29F99EAE for ; Mon, 16 Apr 2018 00:12:27 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org [54.200.247.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 451FD793A9 for ; Mon, 16 Apr 2018 00:12:27 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: b8d46174-410a-11e8-bb8e-b35b57339d60 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound1.ore.mailhop.org (Halon) with ESMTPSA id b8d46174-410a-11e8-bb8e-b35b57339d60; Mon, 16 Apr 2018 00:11:34 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id w3G0CNJ2015905; Sun, 15 Apr 2018 18:12:23 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1523837543.69449.8.camel@freebsd.org> Subject: Re: svn commit: r331722 - in stable/11: bin/cat bin/chflags bin/chmod bin/cp bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/pax bin/ps bi... From: Ian Lepore To: rgrimes@freebsd.org, Glen Barber Cc: Eitan Adler , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Date: Sun, 15 Apr 2018 18:12:23 -0600 In-Reply-To: <201803290317.w2T3Hic6060704@pdx.rh.CN85.dnsmgr.net> References: <201803290317.w2T3Hic6060704@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Mon, 16 Apr 2018 00:12:28 -0000 On Wed, 2018-03-28 at 20:17 -0700, Rodney W. Grimes wrote: > -- Start of PGP signed section. > > > > On Thu, Mar 29, 2018 at 02:51:04AM +0000, Eitan Adler wrote: > > > > > > Author: eadler > > > Date: Thu Mar 29 02:50:57 2018 > > > New Revision: 331722 > > > URL: https://svnweb.freebsd.org/changeset/base/331722 > > > > > > Log: > > >   Revert r330897: > > >    > > >   This was intended to be a non-functional change. It wasn't. The commit > > >   message was thus wrong. In addition it broke arm, and merged crypto > > >   related code. > > >    > > >   Revert with prejudice. > > >    > > >   This revert skips files touched in r316370 since that commit was since > > >   MFCed. > Um, not sure that was the right way to revert :-(. > > > > > > > > >   This revert also skips files that require $FreeBSD$ property > > >   changes. > And more doubts that this is right to skip anything. > > > > > > > > >   Thank you to those who helped me get out of this mess including but not > > >   limited to gonzo, kevans, rgrimes. > > >    > > >   Requested by: gjb (re) > > > > > I did *not* request this, especially not on re@'s behalf.  I provided > > input on what I felt was the correct way to proceed in this situation, > > where a number of commits that were not related to the intent were > > included.  There is a difference. > I tried to get this slowed down until we could get to a concenses, > I think our mess is as big now as it was before. > Or bigger. I've just discovered this commit reverted stuff that wasn't part of the bad original MFC commit. Things I MFC'd to 11 before this revert are now missing changes and the symptoms don't show up until a module fails to load due to missing symbols. I guess every change on the stable-11 branch between r330897 and r331722 needs to be audited to see if MFC'd or changed code has been unintentionally reverted. Here's the example I've just run across... r330897 merged this: https://svnweb.freebsd.org/base/stable/11/sys/dev/spibus/ofw_spibus.c?r1=302408&r2=330897 Then I did some MFCing, then r331722 "reverted" this: https://svnweb.freebsd.org/base/stable/11/sys/dev/spibus/ofw_spibus.c?r1=331506&r2=331722 -- Ian