From: Jens Axboe <axboe@kernel.dk>
To: Song Liu <songliubraving@fb.com>,
linux-raid <linux-raid@vger.kernel.org>
Cc: Logan Gunthorpe <logang@deltatee.com>,
"liuyun01@kylinos.cn" <liuyun01@kylinos.cn>
Subject: Re: [GIT PULL] md-next 20220718
Date: Tue, 19 Jul 2022 10:23:22 -0600 [thread overview]
Message-ID: <a98b85ed-bb95-b619-9799-d946e78a68eb@kernel.dk> (raw)
In-Reply-To: <799F776B-142E-453D-9F8E-595105249E83@fb.com>
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?
--
Jens Axboe
prev parent reply other threads:[~2022-07-19 16:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-18 21:49 [GIT PULL] md-next 20220718 Song Liu
2022-07-19 1:05 ` Song Liu
2022-07-19 16:23 ` Jens Axboe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a98b85ed-bb95-b619-9799-d946e78a68eb@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-raid@vger.kernel.org \
--cc=liuyun01@kylinos.cn \
--cc=logang@deltatee.com \
--cc=songliubraving@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox