diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2025-02-25 11:43:10 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2025-02-25 11:43:10 +0100 |
| commit | 130377304ed09e54ff35a8974372498aad7059f3 (patch) | |
| tree | deac7244baf40d11bd3976416d6e1c656fad3ac7 /include/uapi/linux/taskstats.h | |
| parent | 40115947b59f2ca361a47615304dff0a2b69a2b4 (diff) | |
| parent | fb51bf02551958265b7116f6ba92752295c83c26 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get fixes from v6.14-rc4.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
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 */ |