tgupdate: merge t/DO-NOT-MERGE-mptcp-enabled-by-default into t/upstream base

Author: matttbe

tools/testing/selftests/bpf/progs/cgroup_read_xattr.c

@@ -7,7 +7,6 @@
 #include <bpf/bpf_core_read.h>
 #include "bpf_experimental.h"
 #include "bpf_misc.h"
-#include "cgrp_kfunc_common.h"
 
 char _license[] SEC("license") = "GPL";
 

tools/testing/selftests/bpf/progs/dynptr_success.c

@@ -6,7 +6,6 @@
 #include <stdbool.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
-#include "bpf_kfuncs.h"
 #include "bpf_misc.h"
 #include "errno.h"
 

tools/testing/selftests/bpf/progs/iters_testmod.c

@@ -8,9 +8,6 @@
 
 char _license[] SEC("license") = "GPL";
 
-void bpf_rcu_read_lock(void) __ksym;
-void bpf_rcu_read_unlock(void) __ksym;
-
 SEC("raw_tp/sys_enter")
 __success
 int iter_next_trusted(const void *ctx)

tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c

@@ -6,13 +6,9 @@
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_core_read.h>
 #include "bpf_experimental.h"
-#include "cgrp_kfunc_common.h"
 
 char _license[] SEC("license") = "GPL";
 
-void bpf_rcu_read_lock(void) __ksym;
-void bpf_rcu_read_unlock(void) __ksym;
-
 pid_t target_pid = 0;
 
 char xattr_value[64];