From owner-svn-src-head@freebsd.org Wed May 30 20:10:53 2018 Return-Path: Delivered-To: svn-src-head@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 8D6BBEF9712; Wed, 30 May 2018 20:10:53 +0000 (UTC) (envelope-from delphij@gmail.com) Received: from mail-io0-x22c.google.com (mail-io0-x22c.google.com [IPv6:2607:f8b0:4001:c06::22c]) (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 1C351774A4; Wed, 30 May 2018 20:10:53 +0000 (UTC) (envelope-from delphij@gmail.com) Received: by mail-io0-x22c.google.com with SMTP id l25-v6so688255ioh.12; Wed, 30 May 2018 13:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Hz/ip/htVLaB+ssMMH1CAPoGw2MXV5E+UlUC1lRVgP0=; b=GdjF0Nkdv+hRBuRa8X1KQGz+Q/QfA87Ljz6/5Xug3+o9iY6s7iC6mtVAAfSg+Uv3se phx4dF7ZD+81qpPLHmEMk0LhCKSYOzanGxVBmYPeHSjoQeLKIwG8EXAl9W9iZHnQr8eC wri+OyaLqFDm6NKP9b3Zz8hGz8oWYe4n7lSvt3hxPiBnlTZPWoGbb17zFdUCUMxCWBfa MLa+h3IgvrWMB7ycAvz852J94cK4k8SDbAxxVUi+XzcJqDrli+8CERLEihimVMQvpibs CEydZg5XVCZ7OYQkobCoKExknrkOj0WjpDXFpFwOK8gn3SRXQI8BSDfsWMDLdOBXy2Zp SXtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Hz/ip/htVLaB+ssMMH1CAPoGw2MXV5E+UlUC1lRVgP0=; b=bK6JyWDgrQsF9vfc+cL7gu4wd9l0CfoqKp+gA1A2yysLVYbRi8fZ+xM2Q+pjziOjaD 4HJZwyo1BopAIlhXA/2Qo5cWcr11NpB0kGXccumZvpzOewBp9yui5fDgvPGKusrKOZMx lIiy5HiYwP8ZHUcaYKKuE9vZlQv4eS8zP15VmT7qLNpCHMPW7L5xEnTVcr3h3DL0qWKo RX0aE2l5BPnaOYY5f15ZBYY/kUwpb4N1Ptg93+nDUp1yUB8DKnbkug1G9ogySRF07f3C 9rBZU2JG/FqX3ouYmnwDAYN/sTOMnZXD3UBbl0nHX9eesdVWfJxEtbwHMlBmaORr+JcN bFSQ== X-Gm-Message-State: APt69E2N/K8cQeIv7nqKOcpkDZv5zjgFSLhoMbJQQAIAF10qzW8KoIZV I5n+rnfepisU8W+KMkrjDHZ7D3a4LWtJaUwZiy5/keCe X-Google-Smtp-Source: ADUXVKLzWP1Bi2OLIEXQx+kmmnreODJBlD1VnMZtWtQEQYGmiSXxyF3SLMRagbgZRN9k1nd5G/WVpI2Ws57YNud48to= X-Received: by 2002:a6b:c38b:: with SMTP id t133-v6mr3567848iof.197.1527711051897; Wed, 30 May 2018 13:10:51 -0700 (PDT) MIME-Version: 1.0 References: <201805280812.w4S8CI56046943@repo.freebsd.org> In-Reply-To: <201805280812.w4S8CI56046943@repo.freebsd.org> From: Xin LI Date: Wed, 30 May 2018 13:10:39 -0700 Message-ID: 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: hselasky@freebsd.org Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2018 20:10:53 -0000 On Mon, May 28, 2018 at 1:14 AM Hans Petter Selasky wrote: > Author: hselasky > Date: Mon May 28 08:12:18 2018 > New Revision: 334277 > URL: https://svnweb.freebsd.org/changeset/base/334277 > Log: > MFV r333789: libpcap 1.9.0 (pre-release) > MFC after: 1 month > Sponsored by: Mellanox Technologies > Replaced: > head/contrib/libpcap/ > - copied from r333789, vendor/libpcap/dist/ 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? (You should probably also update sys/net/bpf.h and/or sys/net/dlt.h, by the way).