diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-02-25 17:36:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-02-25 17:36:09 +1000 |
| commit | fb51bf02551958265b7116f6ba92752295c83c26 (patch) | |
| tree | 7642e57ef59c30cf1423196ba071074b931f1d94 /include/uapi/linux/taskstats.h | |
| parent | 7b91683e7de7ddec6b256574308ba77277aeb2e2 (diff) | |
| parent | d082ecbc71e9e0bf49883ee4afd435a77a5101b6 (diff) | |
Merge tag 'v6.14-rc4' into drm-next
Backmerge Linux 6.14-rc4 at the request of tzimmermann so misc-next
can base on rc4.
Signed-off-by: Dave Airlie <airlied@redhat.com>
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 */ |