> On Jun 23, 2023, at 8:41 AM, Jens Axboe <axboe@xxxxxxxxx> wrote: > > On 6/23/23 9:16?AM, Jens Axboe wrote: >>> I will prepare another PR with just fixes. >>> >>> Christoph, >>> >>> Please let me know if you need set #1 (deprecate file bitmap) to >>> unblock other work. Otherwise, we will delay it until 6.6. >> >> I've done a for-6.5/block-late and put your stuff there, but it can be >> dropped very easily. It doesn't really matter if Christoph's stuff can >> get pushed, it's still a lot of commits late. So regardless of that, the >> only real difference with a new PR would be that we'd drop some bits. >> It'd still go into a late branch, as it is indeed late. > > On second thought, yes let's go your suggested route. Make a branch with > JUST the fixes, and send them my way. Anything else will have to wait > for 6.6 at this point. I'll drop my late branch for now. Sounds good! Here is the updated pull request with only minor fixes. Three of the fixes are for patches in the for-6.5/block branch: - md: use mddev->external to select holder in export_rdev() - md/raid1-10: fix casting from randomized structure in raid1_submit_write() - md: fix 'delete_mutex' deadlock Thanks, Song The following changes since commit fcaa174a9c995cf0af3967e55644a1543ea07e36: scsi/sg: don't grab scsi host module reference (2023-06-23 08:28:18 -0600) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git tags/md-next-20230623 for you to fetch changes up to a8d5fdd4d2702d0c7ec125bd3bbce3fc589afa67: raid10: avoid spin_lock from fastpath from raid10_unplug() (2023-06-23 09:41:50 -0700) ---------------------------------------------------------------- Li Nan (1): md/raid10: fix the condition to call bio_end_io_acct() Song Liu (1): md: use mddev->external to select holder in export_rdev() Yu Kuai (3): md/raid1-10: fix casting from randomized structure in raid1_submit_write() md: fix 'delete_mutex' deadlock raid10: avoid spin_lock from fastpath from raid10_unplug() drivers/md/md.c | 32 +++++++++++--------------------- drivers/md/md.h | 4 +--- drivers/md/raid1-10.c | 2 +- drivers/md/raid10.c | 6 +++--- 4 files changed, 16 insertions(+), 28 deletions(-)
