From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull-request: bpf 2018-06-02
Date: Sat, 02 Jun 2018 08:10:04 -0400 (EDT)
Message-ID: <20180602.081004.1813460750616484991.davem@davemloft.net>
References: <20180602050722.24694-1-daniel@iogearbox.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: ast@kernel.org, netdev@vger.kernel.org
To: daniel@iogearbox.net
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:37276 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750740AbeFBMKI (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sat, 2 Jun 2018 08:10:08 -0400
In-Reply-To: <20180602050722.24694-1-daniel@iogearbox.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Sat,  2 Jun 2018 07:07:22 +0200

> The following pull-request contains BPF updates for your *net* tree.
> 
> The main changes are:
> 
> 1) BPF uapi fix in struct bpf_prog_info and struct bpf_map_info in
>    order to fix offsets on 32 bit archs.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
> 
> This will have a minor merge conflict with net-next which has the
> __u32 gpl_compatible:1 bitfield in struct bpf_prog_info at this
> location. Resolution is to use the gpl_compatible member.

Pulled, thanks Daniel.