From mboxrd@z Thu Jan 1 00:00:00 1970 From: Song Liu Subject: Re: [PATCH v2 2/3] tools: sync linux/bpf.h Date: Mon, 8 Oct 2018 16:12:20 -0700 Message-ID: References: <20181001104509.24211-1-lmb@cloudflare.com> <20181008103221.13468-1-lmb@cloudflare.com> <20181008103221.13468-3-lmb@cloudflare.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: Alexei Starovoitov , Daniel Borkmann , Networking , linux-api@vger.kernel.org To: lmb@cloudflare.com Return-path: Received: from mail-qt1-f196.google.com ([209.85.160.196]:34031 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725759AbeJIG0g (ORCPT ); Tue, 9 Oct 2018 02:26:36 -0400 In-Reply-To: <20181008103221.13468-3-lmb@cloudflare.com> Sender: netdev-owner@vger.kernel.org List-ID: On Mon, Oct 8, 2018 at 3:34 AM Lorenz Bauer wrote: > > Synchronize changes to linux/bpf.h from > commit 88db241b34bf ("bpf: allow zero-initializing hash map seed"). I guess we cannot keep this hash during git-am? We probably don't need this hash anyway, as the two patches will be applied back to back. > > Signed-off-by: Lorenz Bauer > --- > tools/include/uapi/linux/bpf.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h > index f9187b41dff6..2c121f862082 100644 > --- a/tools/include/uapi/linux/bpf.h > +++ b/tools/include/uapi/linux/bpf.h > @@ -253,6 +253,8 @@ enum bpf_attach_type { > #define BPF_F_NO_COMMON_LRU (1U << 1) > /* Specify numa node during map creation */ > #define BPF_F_NUMA_NODE (1U << 2) > +/* Zero-initialize hash function seed. This should only be used for testing. */ > +#define BPF_F_ZERO_SEED (1U << 6) Same as 01. > > /* flags for BPF_PROG_QUERY */ > #define BPF_F_QUERY_EFFECTIVE (1U << 0) > -- > 2.17.1 >