From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 21 Oct 2024 06:14:15 +0000 (+0200)
Subject: Merge tag 'v6.12-rc4' into sched/core, to resolve conflict
X-Git-Tag: v6.13-rc1~178^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1fb8a78b2ff1fe4e9478c75b4fbec588a73c1b0;p=thirdparty%2Fkernel%2Flinux.git

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>
---

d1fb8a78b2ff1fe4e9478c75b4fbec588a73c1b0