From owner-svn-src-head@FreeBSD.ORG  Thu Jan 29 16:35:14 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BEFFA7D9;
 Thu, 29 Jan 2015 16:35:14 +0000 (UTC)
Received: from mail-qg0-x22b.google.com (mail-qg0-x22b.google.com
 [IPv6:2607:f8b0:400d:c04::22b])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 740E6384;
 Thu, 29 Jan 2015 16:35:14 +0000 (UTC)
Received: by mail-qg0-f43.google.com with SMTP id e89so30544035qgf.2;
 Thu, 29 Jan 2015 08:35:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date:message-id
 :subject:to:cc:content-type;
 bh=amZ11IUqxmucBIapIgqLqc454FrioQC0C7gNsSaLgUc=;
 b=Dpq08i+onD2DdSH/6W66ud/2oar7nrsCEd6U6WxpOKjvAAk8baYfyHv4xGcEiCgAFO
 vyE5rC1ObgXriAheTkk/b7lippdmeUZNPZm0LOxzPGZb6shaHH8kvifOaum0AVb3O6Nr
 s6cUcQyae5bHCC932frKweRLFjLD2DusGNm0UThzEa1z4RVaYras81cIhAKzXwQ5d1BH
 xHhWShdXSDNA+jH/6PHS4IrptcU7hSJss1ObeILhJUZ+/JwnNq1XzupSydDM8DR3CYbu
 Y1DqbA1fo9FiJYttU6biipcWdbk5ouSgWfSz8WWlNHMkiR+Dp+LsQrNe+IqNS/43/6jM
 hXMw==
X-Received: by 10.140.83.163 with SMTP id j32mr2692629qgd.52.1422549313458;
 Thu, 29 Jan 2015 08:35:13 -0800 (PST)
MIME-Version: 1.0
Sender: carpeddiem@gmail.com
Received: by 10.140.39.209 with HTTP; Thu, 29 Jan 2015 08:34:53 -0800 (PST)
In-Reply-To: <54CA58BD.4090701@FreeBSD.org>
References: <201501291533.t0TFX6Gp081562@svn.freebsd.org>
 <CAPyFy2AwVTLrOj1pceuyHE_a9jqZBGTRnkskT2_C1xzQ-Nw1bg@mail.gmail.com>
 <54CA58BD.4090701@FreeBSD.org>
From: Ed Maste <emaste@freebsd.org>
Date: Thu, 29 Jan 2015 11:34:53 -0500
X-Google-Sender-Auth: ul8sDkxRznJ2Pxsx_8w9WIRfHaA
Message-ID: <CAPyFy2DocbmryFSTREE_XpAfJUi9eEsFvZAk8nrn2OZL=eXqnA@mail.gmail.com>
Subject: Re: svn commit: r277878 - head/contrib/amd/hlfsd
To: Pedro Giffuni <pfg@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>,
 "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
 "src-committers@freebsd.org" <src-committers@freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jan 2015 16:35:14 -0000

On 29 January 2015 at 10:58, Pedro Giffuni <pfg@freebsd.org> wrote:
>
>> Reverting this sort of change shouldn't be necessary, where the change
>> is trivial and identical to the one on the vendor branch. The net
>> result would be the same after the merge from the vendor branch is
>> done.
>
> The upstream version touches a couple more files and I will also
> want to merge it to stable to fix the warnings with modern gcc.

Ok. Everything would still work fine either way (although you'd have
to specify both the original r277841 and the vendor merge for the
MFC).

I'm not really concerned with the revert + merge from vendor, it's
just that avoiding it makes for slightly cleaner history. Also, if
someone tries a search for eligible MFC revisions I think
r277841+r277878 will show up.