On 3/12/25 8:24 PM, Yu Kuai wrote: > Hi Jens, > > Please consider pulling the following changes for md-6.15 on your > for-6.15/block branch, this pull request contains: > > - fix recovery can preempt resync (Li Nan) > - fix md-bitmap IO limit (Su Yue) > - fix raid10 discard with REQ_NOWAIT (Xiao Ni) > - fix raid1 memory leak (Zheng Qixing) > - fix mddev uaf (Yu Kuai) > - fix raid1,raid10 IO flags (Yu Kuai) > - some refactor and cleanup (Yu Kuai) > > Thanks, > Kuai > > The following changes since commit a052bfa636bb763786b9dc13a301a59afb03787a: > > block: refactor rq_qos_wait() (2025-02-11 13:04:11 -0700) > > are available in the Git repository at: > https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux.git tags/md-6.15-20250312 > > for you to fetch changes up to 3db4404435397a345431b45f57876a3df133f3b4: > > md/raid10: wait barrier before returning discard request with REQ_NOWAIT (2025-03-06 22:34:20 +0800) > > ---------------------------------------------------------------- > Li Nan (1): > md: ensure resync is prioritized over recovery > > Su Yue (1): > md/md-bitmap: fix wrong bitmap_limit for clustermd when write sb > > Xiao Ni (1): > md/raid10: wait barrier before returning discard request with REQ_NOWAIT > > Yu Kuai (10): > md: merge common code into find_pers() > md: only include md-cluster.h if necessary > md: introduce struct md_submodule_head and APIs > md: switch personalities to use md_submodule_head > md/md-cluster: cleanup md_cluster_ops reference > md: don't export md_cluster_ops > md: switch md-cluster to use md_submodle_head > md: fix mddev uaf while iterating all_mddevs list > md/raid5: merge reshape_progress checking inside get_reshape_loc() > md/raid1,raid10: don't ignore IO flags Pulled, thanks - fwiw, I did not get any merge conflicts, neither pulling it into my for-6.15/block, nor merging it into my for-next. But if the potential conflict is with 7e5102dd99f3, then that's already in my 6.15 branch. -- Jens Axboe
