]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: af0c8b2 42f7652)
Merge tag 'v6.12-rc4' into sched/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Mon, 21 Oct 2024 06:14:15 +0000 (08:14 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 Oct 2024 06:14:15 +0000 (08:14 +0200)
commitd1fb8a78b2ff1fe4e9478c75b4fbec588a73c1b0
tree1cf2e78b8e7be71a47c8b978dea915533e965cbetree
parentaf0c8b2bf67b25756f27644936e74fd9a6273bd2commit | diff
parent42f7652d3eb527d03665b09edac47f85fb600924commit | diff
Merge tag 'v6.12-rc4' into sched/core, to resolve conflict

Overlapping fixes solving the same bug slightly differently:

  7266f0a6d3bb fs/bcachefs: Fix __wait_on_freeing_inode() definition of waitqueue entry
  3b80552e7057 bcachefs: __wait_for_freeing_inode: Switch to wait_bit_queue_entry

Use the upstream version.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/sched.h diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/sched.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.