From owner-svn-src-all@freebsd.org  Thu May 31 07:41:42 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 24A9CFCA928;
 Thu, 31 May 2018 07:41:42 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B24C875BF8;
 Thu, 31 May 2018 07:41:41 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2016.home.selasky.org (unknown [62.141.128.70])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by mail.turbocat.net (Postfix) with ESMTPSA id 92855260338;
 Thu, 31 May 2018 09:41:40 +0200 (CEST)
Subject: Re: svn commit: r334277 - in head: contrib/libpcap
 contrib/ofed/usr.lib/3 contrib/pf/pflogd contrib/wpa/src/l2_packet lib
 lib/libpcap share/mk usr.sbin/cxgbetool
To: Xin LI <delphij@gmail.com>
Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>,
 "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
 "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
References: <201805280812.w4S8CI56046943@repo.freebsd.org>
 <CAGMYy3usWU3-OeEOkwaUckeFC1fAn0_L9RtuBkbd+8H8vOKfrw@mail.gmail.com>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <22f8b1c6-a03c-4cf0-8ead-551cccdfea95@selasky.org>
Date: Thu, 31 May 2018 09:41:27 +0200
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
 Thunderbird/52.8.0
MIME-Version: 1.0
In-Reply-To: <CAGMYy3usWU3-OeEOkwaUckeFC1fAn0_L9RtuBkbd+8H8vOKfrw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 May 2018 07:41:42 -0000

On 05/30/18 22:10, Xin LI wrote:
> This would make vendor/libpcap/dist history replace head/contrib/libpcap,
> which effectively discards all FreeBSD local changes for base purposes, and
> hides its change history. Is this intentional?  If not, could you please
> revert the tree back to its previous state and redo the merge?
> 

Hi,

> (You should probably also update sys/net/bpf.h and/or sys/net/dlt.h, by the
> way).

It is a vendor library, we should try to avoid local changes?

The problem is that some files are deleted upstream and I'm not sure if 
"merge" will track that when we don't merge from the same branch.

--HPS