From owner-svn-src-stable@freebsd.org Tue Apr 17 14:04:31 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 1311DFA5CF7; Tue, 17 Apr 2018 14:04:31 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: from mail-wr0-x22b.google.com (mail-wr0-x22b.google.com [IPv6:2a00:1450:400c:c0c::22b]) (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 778BD75DF9; Tue, 17 Apr 2018 14:04:30 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: by mail-wr0-x22b.google.com with SMTP id w3so19272752wrg.2; Tue, 17 Apr 2018 07:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=Qp+VFiIwwk2ozfY10bgb1LKlwWb13ufzjkky+y9FlxE=; b=dsXGfMWGnXncp9mouR1/pKfTqrs3xAtZYkf0gHXhFZiFzamnkKx6QnmUpP/iEvsoqH mpyJQhMbIblKg8hYPEKuPCD5D2cDF98NeO5A8f/noQyHHnNHMRnsO+p+NPxCnwGSP3Ug 5qLVPherg68vL9KUOGeM7/0zAJegc57HToWSJE0YI5jLfZlSpvyvZN/wB2EcW/8iHT64 sH+LRCcnYd3N4x1LsRBaBsZxbBm5xTBLvZxMm5egTJA/vAagoNpQaoAkVrd4T9Mp5lY8 QWkBEEMoWCQXbFvHZ8cL3RHX7yMENwPDVivooHGLxWdW9eyJnj7Dy7vD0ZgIIrPnRhDz bIdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=Qp+VFiIwwk2ozfY10bgb1LKlwWb13ufzjkky+y9FlxE=; b=dc+ONaXeqL2s+RVcCeGmMBE38Qztl/2ML5TE6rPtTIWpT92VV+SIR7aZI2ZbhIY3Xy y4u8E99SmJRIkCaCuihsOMULo0tuwTYiHyjZA9VUdH33Ftu4O2upin0vOuQfVxu+ZZ82 KjqDxMxessdEDrr/EcE5dcdoqeqULwp1ikk1Tf7xBYdnVU3XROpaCGlObN2VDDb4hayy uMIU/ieEYXttQjidA3uwy1r0a5o6Nfipi6i6RrVT778jqlgXw0kGCIZggq3vxqndPdUg 8rD/Cz8pV5oW0U5hWIxTWrxy6+/yFTOEAX+PWNeosT0kw38Rb6WK5NHEQg00HMjgHZUi tCJQ== X-Gm-Message-State: ALQs6tAegrAUFDya3ZfZ34pAIBq2Ycz0DkAOMQmqPRvPBUUbc3XoUiQx rt0w8+tOl2ZsVeSjW6OBixb8hw== X-Google-Smtp-Source: AIpwx496WifyQ3sIan8bz14L1K8qDoMwnPRjzS8EDu1/4L6tvmYGOHa0c+2gTO3WIo8XScGiewYzEg== X-Received: by 10.223.139.4 with SMTP id n4mr1786096wra.112.1523973869100; Tue, 17 Apr 2018 07:04:29 -0700 (PDT) Received: from brick (cpc92302-cmbg19-2-0-cust461.5-4.cable.virginm.net. [82.1.209.206]) by smtp.gmail.com with ESMTPSA id w186sm4775695wmw.27.2018.04.17.07.04.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 07:04:28 -0700 (PDT) Sender: =?UTF-8?Q?Edward_Tomasz_Napiera=C5=82a?= Date: Tue, 17 Apr 2018 15:04:26 +0100 From: Edward Napierala To: rgrimes@freebsd.org Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r332596 - stable/11/sys/fs/autofs Message-ID: <20180417140426.GA81689@brick> Mail-Followup-To: rgrimes@freebsd.org, src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <201804171247.w3HClIxS056065@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201804171247.w3HClIxS056065@pdx.rh.CN85.dnsmgr.net> User-Agent: Mutt/1.9.4 (2018-02-28) 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: Tue, 17 Apr 2018 14:04:31 -0000 On 0417T0547, Rodney W. Grimes wrote: > > 2018-04-16 21:36 GMT+01:00 Rodney W. Grimes > > : > > > > > > 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.