diff options
| author | Tejun Heo <tj@kernel.org> | 2025-06-21 06:01:21 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-06-21 06:01:21 +0300 |
| commit | e4e149dd2f80b3f61d738f0b7d9cc9772c1353a4 (patch) | |
| tree | b9f802fff1919304df07cfba45a18ea68e254ad5 /include/linux | |
| parent | e4ee150fea818c8519a0921d53794b763af1a006 (diff) | |
| parent | 33796b91871ad4010c8188372dd1faf97cf0f1c0 (diff) | |
| download | linux-e4e149dd2f80b3f61d738f0b7d9cc9772c1353a4.tar.xz | |
sched_ext: Merge branch 'for-6.16-fixes' into for-6.17
Pull sched_ext/for-6.16-fixes to receive:
c50784e99f0e ("sched_ext: Make scx_group_set_weight() always update tg->scx.weight")
33796b91871a ("sched_ext, sched/core: Don't call scx_group_set_weight() prematurely from sched_create_group()")
which are needed to implement CPU bandwidth control interface support.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/key.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index ba05de8579ec..81b8f05c6898 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -236,7 +236,7 @@ struct key { #define KEY_FLAG_ROOT_CAN_INVAL 7 /* set if key can be invalidated by root without permission */ #define KEY_FLAG_KEEP 8 /* set if key should not be removed */ #define KEY_FLAG_UID_KEYRING 9 /* set if key is a user or user session keyring */ -#define KEY_FLAG_FINAL_PUT 10 /* set if final put has happened on key */ +#define KEY_FLAG_USER_ALIVE 10 /* set if final put has not happened on key yet */ /* the key type and key description string * - the desc is used to match a key against search criteria |