From owner-svn-src-stable@freebsd.org Mon Apr 16 19:00:32 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 34386F9D069 for ; Mon, 16 Apr 2018 19:00:32 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (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 9C10F6DC14 for ; Mon, 16 Apr 2018 19:00:31 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 6d6f4ec0-41a8-11e8-91c6-33ffc249f3e8 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.eu.mailhop.org (Halon) with ESMTPSA id 6d6f4ec0-41a8-11e8-91c6-33ffc249f3e8; Mon, 16 Apr 2018 19:00:29 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id w3GJ0LZj018507; Mon, 16 Apr 2018 13:00:21 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1523905221.69449.14.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: Eitan Adler , Kyle Evans Cc: "Rodney W. Grimes" , Glen Barber , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Date: Mon, 16 Apr 2018 13:00:21 -0600 In-Reply-To: References: <1523837543.69449.8.camel@freebsd.org> <201804160028.w3G0S58v048517@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 19:00:32 -0000 On Sun, 2018-04-15 at 18:08 -0700, Eitan Adler wrote: > On 15 April 2018 at 17:53, Kyle Evans wrote: > > > > On Sun, Apr 15, 2018 at 7:28 PM, Rodney W. Grimes > > wrote: > > > > > > > > > > > On Wed, 2018-03-28 at 20:17 -0700, Rodney W. Grimes wrote: > > > > > > > > > > [...] > > > > > 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? > I am beyond confused. How did > svn merge -c-r330897 . > fail? > If that's literally the command you entered, it may have been the extra '-r' that caused a problem. To backout a single changelist, the command is   svn merge -c -330897 . I wonder if that extra -r separated the changelist number from the -c option, and in effect did a reverse-merge by revision number of everything back to r330897? -- Ian