For dependencies in the following patches Resolve conflicts, use the goto labels from the rc tag. * tag 'v7.1-rc5': (1526 commits)
Showing the changes to include/uapi (1 of 1432 files). Show all
Unified · Split
| @@ -28,7 +28,7 @@ enum rseq_cs_flags_bit { · 27 unmodified lines | ||
| 28 | 28 | RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0, |
| 29 | 29 | RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1, |
| 30 | 30 | RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2, |
| 31 | − /* (3) Intentional gap to put new bits into a separate byte */ | |
| 31 | + /* (3) Intentional gap to keep new bits separate */ | |
| 32 | 32 | |
| 33 | 33 | /* User read only feature flags */ |
| 34 | 34 | RSEQ_CS_FLAG_SLICE_EXT_AVAILABLE_BIT = 4, |
| @@ -161,6 +161,9 @@ struct rseq { · 126 unmodified lines | ||
| 161 | 161 | * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT |
| 162 | 162 | * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL |
| 163 | 163 | * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE |
| 164 | + * | |
| 165 | + * It is now used for feature status advertisement by the kernel. | |
| 166 | + * See: enum rseq_cs_flags_bit for further information. | |
| 164 | 167 | */ |
| 165 | 168 | __u32 flags; |
| 166 | 169 | |