svn commit: r332596 - stable/11/sys/fs/autofs

[Edward Napierala]

On 0417T0547, Rodney W. Grimes wrote:
> > 2018-04-16 21:36 GMT+01:00 Rodney W. Grimes <freebsd at pdx.rh.cn85.dnsmgr.net>
> > :
> > 
> > > > On 0416T1145, Rodney W. Grimes wrote:
> > > > > [ Charset UTF-8 unsupported, converting... ]
> > > > > > Author: trasz
> > > > > > Date: Mon Apr 16 16:15:31 2018
> > > > > > New Revision: 332596
> > > > > > URL: https://svnweb.freebsd.org/changeset/base/332596
> > > > > >
> > > > > > Log:
> > > > > >   MFC r328339:
> > > > > >
> > > > > >   Add SPDX tags to autofs(5).
> > > > > >
> > > > >
> > > > > Please until I resolve the eadler miss merge/revirt mess with
> > > > > SPDX do NOT touch any SPDX stuff in 11/stable.
> > > >
> > > > Ok.  Although, to be honest, I think I've already MFC-ed all the SPDX
> > > stuff
> > > > I had in my queue before seeing your mail, sorry for that.
> > >
> > > Could you do me a really big favor and see if any of the mfc's you
> > > did is in this list:
> > > Merged /head:r325966,326022-326025,326027,326192-326193,326219,
> > > 326255-326261
> > >
> > 
> > No,  my SPDX MFCs were (HEAD revisions): r328342, r328336, r328335,
> > r328341, r328338, r328339, r328337, and r328196.
> 
> I have moved far enough into the process of cleanup of r330897/331722
> that I can verify so far I only have a small handfull of conflicts
> that are managable.
> 
> Some of your commits are going to temporarily need to be reverted,
> the cleanup work I am doing done,
> and then your commits re-applied.
> 
> The only reason for the temporary revert/reapply is to allow
> the larger revert(s) of 330897 and 331722 to be done with 0
> conflicts.
> 
> Revert log message:
> The intent is to use 1 or 2 line log messages of the form:
> Revert rXXXXXX,XXXXXX,.. to clear path for Revert of r331722.
> This revert shall be reverted shortly making this a NOP.
> 
> Revert of Revert log message:
> Reapply rXXXXXX,XXXXXX after revert of r331722.
> 
> I would like to ask for your approval to revert the following
> commits that are in conflict with reverting r331722:
> svn merge -c-332599 .   #trasz
> svn merge -c-332578 .   #trasz
> svn merge -c-332577 .   #trasz
> svn merge -c-332576 .   #trasz
> svn merge -c-332575 .   #trasz
> 
> This block of 5 commits shall be reverted in 1 commit, and
> reapplied in a second commit.
> 
> At present these are the only blocking commits to revert
> r331722, I am still working out the path to revert r330897,
> at present it is at 5 commits needing reverted with 1
> conflict left to figure out.

Sure, no problem, you have my approval.  Sorry for the mess.