]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: c8fafb3 428dc9f)
Merge branch 'for-6.15-fixes' into for-6.16
authorTejun Heo <tj@kernel.org>
Wed, 7 May 2025 16:25:39 +0000 (06:25 -1000)
committerTejun Heo <tj@kernel.org>
Wed, 7 May 2025 16:25:39 +0000 (06:25 -1000)
commit9b30400ff6527c4601fefa2e9cb0b311c6f902d0
tree72f84df4b1a72a41bd042c7b68a7bd673a713d24tree
parentc8fafb34854af4f5036ee0cf582e4b00556c5cd0commit | diff
parent428dc9fc0873989d73918d4a9cc22745b7bbc799commit | 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.
kernel/sched/ext.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.