From owner-svn-src-stable-11@freebsd.org Mon Apr 16 01:44:55 2018 Return-Path: Delivered-To: svn-src-stable-11@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 A2698FA0B60; Mon, 16 Apr 2018 01:44:55 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 440506B8B9; Mon, 16 Apr 2018 01:44:55 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id E396A21251; Mon, 16 Apr 2018 01:44:54 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf0-f47.google.com with SMTP id i18-v6so4683831lfc.7; Sun, 15 Apr 2018 18:44:54 -0700 (PDT) X-Gm-Message-State: ALQs6tBFOcz528ov8YcPHUim1W9jmoFqwgRCEOjmq0Do6yeELtf/f9d6 KRAob5W8x4LLX8MXiVPc1B+gnupO6AJ9Dr0kIs8= X-Google-Smtp-Source: AIpwx48NuEtiNo2sdGdUgyycfT4+0la9QmX1x/Kgcl3lDWDWmNdoWs5uQcJmvpVw2RCQu8CNbf0R+4vWgx+pnCH5lYk= X-Received: by 10.46.68.14 with SMTP id r14mr8430133lja.44.1523843093373; Sun, 15 Apr 2018 18:44:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.46.129.90 with HTTP; Sun, 15 Apr 2018 18:44:32 -0700 (PDT) In-Reply-To: <201804160140.w3G1e7Vj048799@pdx.rh.CN85.dnsmgr.net> References: <201804160140.w3G1e7Vj048799@pdx.rh.CN85.dnsmgr.net> From: Kyle Evans Date: Sun, 15 Apr 2018 20:44:32 -0500 X-Gmail-Original-Message-ID: Message-ID: 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... To: "Rodney W. Grimes" Cc: Kyle Evans , Ian Lepore , Glen Barber , Eitan Adler , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2018 01:44:55 -0000 On Sun, Apr 15, 2018 at 8:40 PM, Rodney W. Grimes 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: >> >> > -- 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 > > I have confirmed this in a first pass audit, there are changes to ofw_spibus.c > that are not in the original r330897 commit, but are in the r331722 commit. > >> > *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 support this effort, as long as we either still don't revert >> anything touching the files that gonzo went through the trouble of >> getting back into shape or we also revert gonzo's follow-up MFCs and >> re-MFC those bits in particular for him. eadler's original commit had >> included an impartial MFC of some of gonzo's commits (somehow?), hence >> the follow-up that completed the MFC. > > Can you help to identify what part or even just file paths, that gonzo is > depending on having been merged by r330897, that would help me greatly. Those touched in r316370: sys/arm/arm/pl190.c sys/arm/conf/VERSATILEPB sys/arm/versatile/* > Right now I have the 80k line diffs down to the 8k or so "extra stuff", > that should of not been commited in the first diff to try and audit > against the second diff. > Excellent! Thanks for doing this. =)