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_re.py | |
| parent | sched_ext: Avoid NULL scx_root deref in __scx_exit() (diff) | |
| parent | sched_ext: bpf_iter_scx_dsq_new() should always initialize iterator (diff) | |
| download | wireguard-linux-9b30400ff6527c4601fefa2e9cb0b311c6f902d0.tar.xz wireguard-linux-9b30400ff6527c4601fefa2e9cb0b311c6f902d0.zip | |
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_re.py')
0 files changed, 0 insertions, 0 deletions