diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-02-21 05:10:24 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-02-21 05:13:57 +0300 |
| commit | bd4319b6c2b36aa5c6534aec1dbe16921ec960ef (patch) | |
| tree | aec6748a7c59ea9a3ebb2c543b2e7f0ce2806b91 /include/uapi/linux/taskstats.h | |
| parent | 7042882abc04c720ea798198981943502f4221fe (diff) | |
| parent | 319fc77f8f45a1b3dba15b0cc1a869778fd222f7 (diff) | |
| download | linux-bd4319b6c2b36aa5c6534aec1dbe16921ec960ef.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf bpf-6.14-rc4
Cross-merge bpf fixes after downstream PR (bpf-6.14-rc4).
Minor conflict:
kernel/bpf/btf.c
Adjacent changes:
kernel/bpf/arena.c
kernel/bpf/btf.c
kernel/bpf/syscall.c
kernel/bpf/verifier.c
mm/memory.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/uapi/linux/taskstats.h')
| -rw-r--r-- | include/uapi/linux/taskstats.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/taskstats.h b/include/uapi/linux/taskstats.h index 934e20ef7f79..95762232e018 100644 --- a/include/uapi/linux/taskstats.h +++ b/include/uapi/linux/taskstats.h @@ -34,7 +34,7 @@ */ -#define TASKSTATS_VERSION 14 +#define TASKSTATS_VERSION 15 #define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN * in linux/sched.h */ |