From owner-svn-src-stable-11@freebsd.org Mon Apr 16 01:08:42 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 59D1DF9E378 for ; Mon, 16 Apr 2018 01:08:42 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x22a.google.com (mail-yw0-x22a.google.com [IPv6:2607:f8b0:4002:c05::22a]) (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 DF44784A93 for ; Mon, 16 Apr 2018 01:08:41 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x22a.google.com with SMTP id q12so6137670ywj.0 for ; Sun, 15 Apr 2018 18:08:41 -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=fOgEzHPJFoNJkUqKNES08k44ZWa02dURnykPNVSMm7E=; b=h1AYAq1yyHE/DLvE5QhYH/n2C3u5AAWOdysSw25qVobqPDri5V93sQze/BB7zH3A7W goGsptpaCFMH0walTTPLwxJ7EJ7n9vWUUTB5zzdij74miUxU03dLMiF+knMssmOiocta 62etqhOvULSUq84jVgFPtmo5XGSt4IJfjEzhw= 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=fOgEzHPJFoNJkUqKNES08k44ZWa02dURnykPNVSMm7E=; b=RIFecc8r32BmYl5MovJQaYeee8j9l9CGyBOtNetkU5psuTur7jl5BfOx/sMtXwCFOh vFSkZyJT8ld+8TcFmzkWCzNl1ePzyP35u9UJzqhoYPEjKcL6jqKZVpjvT24SYWgHvNVt dZY8Jo2V5fXyeX0FbTH4MoaKOOaRw8pMU/2mtLRnsb83Lmbli84lGMaLzI+I2F3DxBhq gaQY8R/qOfo4Pkk3mYOFGbTrA2VFN70OP/Jv/Ign+fxy9lvLayzDOTTVxxmT1vY1FCDz BGX1S+RAIv79eaNIrHlnN4+r38K8v1toOU75LRRdtMjdr2b3OyeTX9OK/iWJnzApnYM9 RXBA== X-Gm-Message-State: ALQs6tAvwHEyWQyrKF9krPY4thAWESdIq/rlUjxDUiF4wWT5qJB7flYQ 5nf8i5uJmWq1OOFG0hFuTHkQjCQr/St3/0DgLRyEbA== X-Google-Smtp-Source: AIpwx4//SKJOAsmQ4Qjvcm9dSVTGroBqWzLMrPw9j/4H3QZxJgExQtRJHC5WV9SLihDdJmhIEkJITR3fiTLQz4amiZs= X-Received: by 10.129.79.196 with SMTP id d187mr9186993ywb.162.1523840921095; Sun, 15 Apr 2018 18:08:41 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 2002:a25:98c3:0:0:0:0:0 with HTTP; Sun, 15 Apr 2018 18:08:10 -0700 (PDT) In-Reply-To: References: <1523837543.69449.8.camel@freebsd.org> <201804160028.w3G0S58v048517@pdx.rh.CN85.dnsmgr.net> From: Eitan Adler Date: Sun, 15 Apr 2018 18:08:10 -0700 X-Google-Sender-Auth: y84VGf5VTSRR0Vlijm5XfS8dOXg 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: Kyle Evans Cc: "Rodney W. Grimes" , Ian Lepore , Glen Barber , 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:08:42 -0000 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: >>> > -- 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? I am beyond confused. How did svn merge -c-r330897 . fail? At this point I am scared of touching subversion as I have no idea how what I do will interact with the repository, mergeinfo, etc. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams