From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=qS/a=VB=vger.kernel.org=netdev-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id CCE92C46495
	for <netdev@archiver.kernel.org>; Thu,  4 Jul 2019 20:49:44 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id AECCC21852
	for <netdev@archiver.kernel.org>; Thu,  4 Jul 2019 20:49:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727102AbfGDUto (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Thu, 4 Jul 2019 16:49:44 -0400
Received: from shards.monkeyblade.net ([23.128.96.9]:53394 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726892AbfGDUto (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 4 Jul 2019 16:49:44 -0400
Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::d71])
        (using TLSv1 with cipher AES256-SHA (256/256 bits))
        (Client did not present a certificate)
        (Authenticated sender: davem-davemloft)
        by shards.monkeyblade.net (Postfix) with ESMTPSA id 36B06146A4B60;
        Thu,  4 Jul 2019 13:49:43 -0700 (PDT)
Date:   Thu, 04 Jul 2019 13:49:40 -0700 (PDT)
Message-Id: <20190704.134940.462462778251829402.davem@davemloft.net>
To:     daniel@iogearbox.net
Cc:     ast@kernel.org, saeedm@mellanox.com, netdev@vger.kernel.org,
        bpf@vger.kernel.org
Subject: Re: pull-request: bpf-next 2019-07-03
From:   David Miller <davem@davemloft.net>
In-Reply-To: <20190703224740.15354-1-daniel@iogearbox.net>
References: <20190703224740.15354-1-daniel@iogearbox.net>
X-Mailer: Mew version 6.8 on Emacs 26.1
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Thu, 04 Jul 2019 13:49:43 -0700 (PDT)
Sender: netdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu,  4 Jul 2019 00:47:40 +0200

> The following pull-request contains BPF updates for your *net-next* tree.
> 
> There is a minor merge conflict in mlx5 due to 8960b38932be ("linux/dim:
> Rename externally used net_dim members") which has been pulled into your
> tree in the meantime, but resolution seems not that bad ... getting current
> bpf-next out now before there's coming more on mlx5. ;) I'm Cc'ing Saeed
> just so he's aware of the resolution below:
 ...

Thanks for the detailed merge resolution guidance, it helps a lot.

> Let me know if you run into any issues. Anyway, the main changes are:
 ...
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

Pulled.