mbox series

[GIT,PULL] md-next 20220718

Message ID 4122CEAB-991E-4A4D-90FD-C48325935876@fb.com (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL] md-next 20220718 | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git md-next

Message

Song Liu July 18, 2022, 9:49 p.m. UTC
Hi Jens, 

Please consider pulling the following changes on top of your for-5.20/drivers
branch. The major changes are:
  1. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
  2. 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 f8584a43b407dc0b7277e722a4b7fbca9f4bee44:

  raid5: fix duplicate checks for rdev->saved_raid_disk (2022-07-18 14:33:58 -0700)

----------------------------------------------------------------
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/raid5.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

Comments

Song Liu July 19, 2022, 1:05 a.m. UTC | #1
> On Jul 18, 2022, at 2:49 PM, Song Liu <songliubraving@fb.com> wrote:
> 
> Hi Jens, 
> 
> Please consider pulling the following changes on top of your for-5.20/drivers
> branch. The major changes are:
>  1. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
>  2. 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 f8584a43b407dc0b7277e722a4b7fbca9f4bee44:
> 
>  raid5: fix duplicate checks for rdev->saved_raid_disk (2022-07-18 14:33:58 -0700)
> 
> ----------------------------------------------------------------
> Jackie Liu (1):
>      raid5: fix duplicate checks for rdev->saved_raid_disk

Forgot to mention: 

This patch conflicts with the following commit in upstream and linux-next:

commit 617b365872a2 ("dm raid: fix KASAN warning in raid5_add_disks")

It should be straightforward to fix. 

Thanks,
Song

> 
> 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/raid5.c | 35 ++++++++++++++++++-----------------
> 1 file changed, 18 insertions(+), 17 deletions(-)
Jens Axboe July 19, 2022, 4:23 p.m. UTC | #2
On 7/18/22 7:05 PM, Song Liu wrote:
> 
> 
>> On Jul 18, 2022, at 2:49 PM, Song Liu <songliubraving@fb.com> wrote:
>>
>> Hi Jens, 
>>
>> Please consider pulling the following changes on top of your for-5.20/drivers
>> branch. The major changes are:
>>  1. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe;
>>  2. 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 f8584a43b407dc0b7277e722a4b7fbca9f4bee44:
>>
>>  raid5: fix duplicate checks for rdev->saved_raid_disk (2022-07-18 14:33:58 -0700)
>>
>> ----------------------------------------------------------------
>> Jackie Liu (1):
>>      raid5: fix duplicate checks for rdev->saved_raid_disk
> 
> Forgot to mention: 
> 
> This patch conflicts with the following commit in upstream and linux-next:
> 
> commit 617b365872a2 ("dm raid: fix KASAN warning in raid5_add_disks")
> 
> It should be straightforward to fix. 

Since the conflicting patch in the above tree is just a cleanup, let's
please defer that. I usually don't mind dealing with conflicts if they
are inevitable, but when it's just a cleanup then I think it'd be better
to defer to after the merge window.

Can you send this pull request with just the fix instead?