* [GIT PULL] md-next 20220719
@ 2022-07-19 18:43 Song Liu
2022-07-19 18:45 ` Jens Axboe
0 siblings, 1 reply; 7+ messages in thread
From: Song Liu @ 2022-07-19 18:43 UTC (permalink / raw)
To: Jens Axboe, linux-raid; +Cc: Christoph Hellwig, Logan Gunthorpe
Hi Jens,
Please consider pulling the following changes on top of your for-5.20/drivers
branch. The major changes are:
1. Fix md disk_name lifetime problems, by Christoph Hellwig;
2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
Thanks,
Song
The following changes since commit 8c740c6bf12dec03b6f35b19fe6c183929d0b88a:
null_blk: fix ida error handling in null_add_dev() (2022-07-15 09:04:38 -0600)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git md-next
for you to fetch changes up to e6b0075be44e5d0431d4463d4feba2edba8e8d24:
md: simplify md_open (2022-07-19 10:54:17 -0700)
----------------------------------------------------------------
Christoph Hellwig (10):
md: fix mddev->kobj lifetime
md: fix error handling in md_alloc
md: implement ->free_disk
md: rename md_free to md_kobj_release
md: factor out the rdev overlaps check from rdev_size_store
md: stop using for_each_mddev in md_do_sync
md: stop using for_each_mddev in md_notify_reboot
md: stop using for_each_mddev in md_exit
md: only delete entries from all_mddevs when the disk is freed
md: simplify md_open
Logan Gunthorpe (2):
md/raid5: Fix sectors_to_do bitmap overflow in raid5_make_request()
md/raid5: Convert prepare_to_wait() to wait_woken() api
drivers/md/md.c | 310 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
drivers/md/md.h | 2 ++
drivers/md/raid5.c | 32 +++++++++++-----------
3 files changed, 182 insertions(+), 162 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] md-next 20220719
2022-07-19 18:43 [GIT PULL] md-next 20220719 Song Liu
@ 2022-07-19 18:45 ` Jens Axboe
2022-07-19 19:10 ` Song Liu
0 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2022-07-19 18:45 UTC (permalink / raw)
To: Song Liu, linux-raid; +Cc: Christoph Hellwig, Logan Gunthorpe
On 7/19/22 12:43 PM, Song Liu wrote:
> Hi Jens,
>
> Please consider pulling the following changes on top of your for-5.20/drivers
> branch. The major changes are:
> 1. Fix md disk_name lifetime problems, by Christoph Hellwig;
> 2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
> 3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
This has worse conflicts, it looks like. And not particularly trivial.
Do you have a merge resolution?
We might want to consider doing a special branch for this...
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] md-next 20220719
2022-07-19 18:45 ` Jens Axboe
@ 2022-07-19 19:10 ` Song Liu
2022-07-20 3:03 ` Jens Axboe
0 siblings, 1 reply; 7+ messages in thread
From: Song Liu @ 2022-07-19 19:10 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-raid, Christoph Hellwig, Logan Gunthorpe
> On Jul 19, 2022, at 11:45 AM, Jens Axboe <axboe@kernel.dk> wrote:
>
> On 7/19/22 12:43 PM, Song Liu wrote:
>> Hi Jens,
>>
>> Please consider pulling the following changes on top of your for-5.20/drivers
>> branch. The major changes are:
>> 1. Fix md disk_name lifetime problems, by Christoph Hellwig;
>> 2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
>> 3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
>
> This has worse conflicts, it looks like. And not particularly trivial.
> Do you have a merge resolution?
Hmm... it was a clean merge on top of Linus' tree, but got conflicts with
linux-next. I guess the conflict is from other changes in the block tree?
>
> We might want to consider doing a special branch for this...
Yeah, I can port each patch on top of the special branch. To make sure they
all work.
Thanks,
Song
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] md-next 20220719
2022-07-19 19:10 ` Song Liu
@ 2022-07-20 3:03 ` Jens Axboe
2022-07-20 5:56 ` Song Liu
0 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2022-07-20 3:03 UTC (permalink / raw)
To: Song Liu; +Cc: linux-raid, Christoph Hellwig, Logan Gunthorpe
On 7/19/22 1:10 PM, Song Liu wrote:
>
>
>> On Jul 19, 2022, at 11:45 AM, Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 7/19/22 12:43 PM, Song Liu wrote:
>>> Hi Jens,
>>>
>>> Please consider pulling the following changes on top of your for-5.20/drivers
>>> branch. The major changes are:
>>> 1. Fix md disk_name lifetime problems, by Christoph Hellwig;
>>> 2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
>>> 3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
>>
>> This has worse conflicts, it looks like. And not particularly trivial.
>> Do you have a merge resolution?
>
> Hmm... it was a clean merge on top of Linus' tree, but got conflicts
> with linux-next. I guess the conflict is from other changes in the
> block tree?
Most likely core block changes, I would suspect, from Christoph.
>> We might want to consider doing a special branch for this...
>
> Yeah, I can port each patch on top of the special branch. To make sure
> they all work.
I've done a for-5.20/drivers-late branch that you can base on, that
should be the sanest way to do this.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] md-next 20220719
2022-07-20 3:03 ` Jens Axboe
@ 2022-07-20 5:56 ` Song Liu
2022-07-20 6:08 ` Song Liu
0 siblings, 1 reply; 7+ messages in thread
From: Song Liu @ 2022-07-20 5:56 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-raid, Christoph Hellwig, Logan Gunthorpe, Jackie Liu
> On Jul 19, 2022, at 8:03 PM, Jens Axboe <axboe@kernel.dk> wrote:
>
> On 7/19/22 1:10 PM, Song Liu wrote:
>>
>>
>>> On Jul 19, 2022, at 11:45 AM, Jens Axboe <axboe@kernel.dk> wrote:
>>>
>>> On 7/19/22 12:43 PM, Song Liu wrote:
>>>> Hi Jens,
>>>>
>>>> Please consider pulling the following changes on top of your for-5.20/drivers
>>>> branch. The major changes are:
>>>> 1. Fix md disk_name lifetime problems, by Christoph Hellwig;
>>>> 2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
>>>> 3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
>>>
>>> This has worse conflicts, it looks like. And not particularly trivial.
>>> Do you have a merge resolution?
>>
>> Hmm... it was a clean merge on top of Linus' tree, but got conflicts
>> with linux-next. I guess the conflict is from other changes in the
>> block tree?
>
> Most likely core block changes, I would suspect, from Christoph.
>
>>> We might want to consider doing a special branch for this...
>>
>> Yeah, I can port each patch on top of the special branch. To make sure
>> they all work.
>
> I've done a for-5.20/drivers-late branch that you can base on, that
> should be the sanest way to do this.
Thanks Jens! (assuming the branch is named for-5.20/drivers-post).
Please consider the following pull request. The major changes are:
1. Fix md disk_name lifetime problems, by Christoph Hellwig;
2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
Thanks!
Song
The following changes since commit bd1ebc67722962962b0d568c26f62bfa7bfe786f:
Merge branch 'for-5.20/drivers' into for-5.20/drivers-post (2022-07-19 21:03:38 -0600)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git md-next
for you to fetch changes up to cce99141d81f4967ed0936bb3506d6813ec9abfb:
raid5: fix duplicate checks for rdev->saved_raid_disk (2022-07-19 22:46:28 -0700)
----------------------------------------------------------------
Christoph Hellwig (10):
md: fix mddev->kobj lifetime
md: fix error handling in md_alloc
md: implement ->free_disk
md: rename md_free to md_kobj_release
md: factor out the rdev overlaps check from rdev_size_store
md: stop using for_each_mddev in md_do_sync
md: stop using for_each_mddev in md_notify_reboot
md: stop using for_each_mddev in md_exit
md: only delete entries from all_mddevs when the disk is freed
md: simplify md_open
Jackie Liu (1):
raid5: fix duplicate checks for rdev->saved_raid_disk
Logan Gunthorpe (2):
md/raid5: Fix sectors_to_do bitmap overflow in raid5_make_request()
md/raid5: Convert prepare_to_wait() to wait_woken() api
drivers/md/md.c | 310 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
drivers/md/md.h | 2 ++
drivers/md/raid5.c | 35 ++++++++++++------------
3 files changed, 183 insertions(+), 164 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] md-next 20220719
2022-07-20 5:56 ` Song Liu
@ 2022-07-20 6:08 ` Song Liu
2022-07-20 13:07 ` Jens Axboe
0 siblings, 1 reply; 7+ messages in thread
From: Song Liu @ 2022-07-20 6:08 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-raid, Christoph Hellwig, Logan Gunthorpe, Jackie Liu
> On Jul 19, 2022, at 10:56 PM, Song Liu <songliubraving@fb.com> wrote:
[...]
> Thanks Jens! (assuming the branch is named for-5.20/drivers-post).
>
> Please consider the following pull request. The major changes are:
>
> 1. Fix md disk_name lifetime problems, by Christoph Hellwig;
> 2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
> 3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
One more last minute change (added Logan's Reviewed-by to two commits).
Thanks,
Song
The following changes since commit bd1ebc67722962962b0d568c26f62bfa7bfe786f:
Merge branch 'for-5.20/drivers' into for-5.20/drivers-post (2022-07-19 21:03:38 -0600)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git md-next
for you to fetch changes up to 211a3702d5aecd9f20823ebe7dcea5b915fae08f:
raid5: fix duplicate checks for rdev->saved_raid_disk (2022-07-19 23:03:35 -0700)
----------------------------------------------------------------
Christoph Hellwig (10):
md: fix mddev->kobj lifetime
md: fix error handling in md_alloc
md: implement ->free_disk
md: rename md_free to md_kobj_release
md: factor out the rdev overlaps check from rdev_size_store
md: stop using for_each_mddev in md_do_sync
md: stop using for_each_mddev in md_notify_reboot
md: stop using for_each_mddev in md_exit
md: only delete entries from all_mddevs when the disk is freed
md: simplify md_open
Jackie Liu (1):
raid5: fix duplicate checks for rdev->saved_raid_disk
Logan Gunthorpe (2):
md/raid5: Fix sectors_to_do bitmap overflow in raid5_make_request()
md/raid5: Convert prepare_to_wait() to wait_woken() api
drivers/md/md.c | 310 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------
drivers/md/md.h | 2 ++
drivers/md/raid5.c | 35 ++++++++++++------------
3 files changed, 183 insertions(+), 164 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] md-next 20220719
2022-07-20 6:08 ` Song Liu
@ 2022-07-20 13:07 ` Jens Axboe
0 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2022-07-20 13:07 UTC (permalink / raw)
To: Song Liu; +Cc: linux-raid, Christoph Hellwig, Logan Gunthorpe, Jackie Liu
On 7/20/22 12:08 AM, Song Liu wrote:
>
>> On Jul 19, 2022, at 10:56 PM, Song Liu <songliubraving@fb.com> wrote:
>
> [...]
>
>> Thanks Jens! (assuming the branch is named for-5.20/drivers-post).
>>
>> Please consider the following pull request. The major changes are:
>>
>> 1. Fix md disk_name lifetime problems, by Christoph Hellwig;
>> 2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
>> 3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe.
>
> One more last minute change (added Logan's Reviewed-by to two commits).
Pulled, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-07-20 13:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-19 18:43 [GIT PULL] md-next 20220719 Song Liu
2022-07-19 18:45 ` Jens Axboe
2022-07-19 19:10 ` Song Liu
2022-07-20 3:03 ` Jens Axboe
2022-07-20 5:56 ` Song Liu
2022-07-20 6:08 ` Song Liu
2022-07-20 13:07 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.