Date: Sun, 15 Apr 2018 17:28:05 -0700 (PDT) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Ian Lepore <ian@freebsd.org> Cc: rgrimes@freebsd.org, Glen Barber <gjb@freebsd.org>, Eitan Adler <eadler@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@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... Message-ID: <201804160028.w3G0S58v048517@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <1523837543.69449.8.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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 *sigh* Ok, I can at least do an audit of the r331722 that was suppose to be a revert and see what else I find. I'll start on this tomarrow and get the first pass audit out fairly early in the morning my time (PST) Do we revert the attempted revert, then properly revert the original? -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804160028.w3G0S58v048517>