From: Alexei Starovoitov <ast@kernel.org>
Date: Mon, 1 Nov 2021 21:16:03 +0000 (-0700)
Subject: Merge branch '"map_extra" and bloom filter fixups'
X-Git-Tag: v6.6-pxa1908~5313^2~2^2~7
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=669810030bbce1c1bda8379fc7c475738b2ff0d4;p=linux.git

Merge branch '"map_extra" and bloom filter fixups'

Joanne Koong says:

====================

There are 3 patches in this patchset:

1/3 - Bloom filter naming fixups (kernel/bpf/bloom_filter.c)

2/3 - Add alignment padding for map_extra, rearrange fields in
bpf_map struct to consolidate holes

3/3 - Bloom filter tests (prog_tests/bloom_filter_map):
Add test for successful userspace calls, some refactoring to
use bpf_create_map instead of bpf_create_map_xattr

v1 -> v2:
    * In prog_tests/bloom_filter_map: remove unneeded line break,
	also change the inner_map_test to use bpf_create_map instead
	of bpf_create_map_xattr.
    * Add acked-bys to commit messages
====================

Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

669810030bbce1c1bda8379fc7c475738b2ff0d4