Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Minor conflict, a CHECK was placed into an if() statement
in net-next, whilst a newline was added to that CHECK
call in 'net'.  Thanks to Daniel for the merge resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/Kconfig
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_progs.c
index fac581f1c57ff2dfcde6b421679259c441ad1027,aa336f0abebc325f00a4bb68ecdfc3635e9d76e7..ed197eef1cfc728fdf84baa496f8c48e1c7efb41
--- 1/tools/testing/selftests/bpf/test_progs.c
--- 2/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@@ -1137,9 -1193,14 +1193,14 @@@ static void test_stacktrace_build_id(vo
                  err, errno))
                goto disable_pmu;
  
+       stack_amap_fd = bpf_find_map(__func__, obj, "stack_amap");
+       if (CHECK(stack_amap_fd < 0, "bpf_find_map stack_amap",
+                 "err %d errno %d\n", err, errno))
+               goto disable_pmu;
+ 
        assert(system("dd if=/dev/urandom of=/dev/zero count=4 2> /dev/null")
               == 0);
 -      assert(system("./urandom_read if=/dev/urandom of=/dev/zero count=4 2> /dev/null") == 0);
 +      assert(system("./urandom_read") == 0);
        /* disable stack trace collection */
        key = 0;
        val = 1;
@@@ -1188,8 -1249,15 +1249,15 @@@
                previous_key = key;
        } while (bpf_map_get_next_key(stackmap_fd, &previous_key, &key) == 0);
  
-       CHECK(build_id_matches < 1, "build id match",
-             "Didn't find expected build ID from the map\n");
+       if (CHECK(build_id_matches < 1, "build id match",
 -                "Didn't find expected build ID from the map"))
++                "Didn't find expected build ID from the map\n"))
+               goto disable_pmu;
+ 
+       stack_trace_len = PERF_MAX_STACK_DEPTH
+               * sizeof(struct bpf_stack_build_id);
+       err = compare_stack_ips(stackmap_fd, stack_amap_fd, stack_trace_len);
+       CHECK(err, "compare_stack_ips stackmap vs. stack_amap",
+             "err %d errno %d\n", err, errno);
  
  disable_pmu:
        ioctl(pmu_fd, PERF_EVENT_IOC_DISABLE);