| Message ID | 20250313022445.2229190-1-yukuai1@huaweicloud.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] md-6.15-20250312 | expand |
Hi, 在 2025/03/13 10:24, Yu Kuai 写道: > 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 > Due to: 7e5102dd99f3 ("md: improve return types of badblocks handling functions") There is a minor conflict in: c594de0455b3 ("md: don't export md_cluster_ops") Conflict resolution: diff --git a/drivers/md/md.h b/drivers/md/md.h -index f9e0f0d390f1..873f33e2a1f6 100644 +index e46c0cb191e3..6c50cd5fbea2 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h -@@ -320,6 +320,7 @@ extern int rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors, - extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors, - int is_new); +@@ -320,6 +320,7 @@ extern bool rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors, + extern void rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors, + int is_new); struct md_cluster_info; +struct md_cluster_operations; Please let me know if I should send a new pr. 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 > > Zheng Qixing (1): > md/raid1: fix memory leak in raid1_run() if no active rdev > > drivers/md/md-bitmap.c | 14 ++- > drivers/md/md-cluster.c | 18 ++- > drivers/md/md-cluster.h | 6 + > drivers/md/md-linear.c | 15 ++- > drivers/md/md.c | 295 ++++++++++++++++++++++++------------------------ > drivers/md/md.h | 48 +++++--- > drivers/md/raid0.c | 18 +-- > drivers/md/raid1-10.c | 4 +- > drivers/md/raid1.c | 46 ++++---- > drivers/md/raid10.c | 52 ++++----- > drivers/md/raid5.c | 91 ++++++++++----- > 11 files changed, 338 insertions(+), 269 deletions(-) > > . >
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.
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 Zheng Qixing (1): md/raid1: fix memory leak in raid1_run() if no active rdev drivers/md/md-bitmap.c | 14 ++- drivers/md/md-cluster.c | 18 ++- drivers/md/md-cluster.h | 6 + drivers/md/md-linear.c | 15 ++- drivers/md/md.c | 295 ++++++++++++++++++++++++------------------------ drivers/md/md.h | 48 +++++--- drivers/md/raid0.c | 18 +-- drivers/md/raid1-10.c | 4 +- drivers/md/raid1.c | 46 ++++---- drivers/md/raid10.c | 52 ++++----- drivers/md/raid5.c | 91 ++++++++++----- 11 files changed, 338 insertions(+), 269 deletions(-)