> On Sun, Apr 15, 2018 at 7:28 PM, Rodney W. Grimes
> <free...@pdx.rh.cn85.dnsmgr.net> 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.

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.

The merginfo looks correct:
Index: stable/11
===================================================================
--- stable/11   (revision 330896)
+++ stable/11   (revision 330897)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r325966,326022-326025,326027,326192-326193,326219,326255-326261


Index: stable/11
===================================================================
--- stable/11   (revision 331721)
+++ stable/11   (revision 331722)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,1 +0,0 ##
   Reverse-merged 
/head:r325966,326022-326025,326027,326192-326193,326219,326255-326261


-- 
Rod Grimes                                                 rgri...@freebsd.org
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to