diff options
| author | Tejun Heo <tj@kernel.org> | 2025-05-07 06:25:39 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-05-07 06:25:39 -1000 |
| commit | 9b30400ff6527c4601fefa2e9cb0b311c6f902d0 (patch) | |
| tree | 72f84df4b1a72a41bd042c7b68a7bd673a713d24 /scripts/lib/kdoc/kdoc_parser.py | |
| parent | c8fafb34854af4f5036ee0cf582e4b00556c5cd0 (diff) | |
| parent | 428dc9fc0873989d73918d4a9cc22745b7bbc799 (diff) | |
Merge branch 'for-6.15-fixes' into for-6.16
To receive 428dc9fc0873 ("sched_ext: bpf_iter_scx_dsq_new() should always
initialize iterator") which conflicts with cdf5a6faa8cf ("sched_ext: Move
dsq_hash into scx_sched"). The conflict is a simple context conflict which
can be resolved by taking changes from both changes in the right order.
Diffstat (limited to 'scripts/lib/kdoc/kdoc_parser.py')
0 files changed, 0 insertions, 0 deletions