From: Jens Axboe <axboe@kernel.dk>
To: miaoqinglang <miaoqinglang@huawei.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Joshua Morris <josh.h.morris@us.ibm.com>,
Philip Kelleher <pjk1939@linux.ibm.com>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH -next] rsxx: Convert to DEFINE_SHOW_ATTRIBUTE
Date: Thu, 16 Jul 2020 20:16:33 -0600 [thread overview]
Message-ID: <87a5f046-e77b-af25-6656-c8b075a16edf@kernel.dk> (raw)
In-Reply-To: <c19c9e32-4b31-bcf1-df45-a29220e7e6cc@huawei.com>
On 7/16/20 7:37 PM, miaoqinglang wrote:
>
> 在 2020/7/16 23:45, Jens Axboe 写道:
>> On 7/16/20 3:04 AM, Qinglang Miao wrote:
>>> From: Liu Shixin <liushixin2@huawei.com>
>>>
>>> Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.
>> None of these apply against the 5.9 block tree, looks like some
>> read -> read_iter conversion has happened in another branch that
>> I'm not privy to.
>
> Hi Jens,
>
> Sorry I didn't mention it in commit log, but this patch is based
> on linux-next where commit <4d4901c6d7> has switched over direct
> seq_read method calls to seq_read_iter, this is why there's conflict in
> your apply.
>
> Do you think I should send a new patch based on 5.8rc?
That'll just create a needless conflict. But I don't even know what tree
is carrying the patch that changes it to use seq_read_iter, so hard to
make other suggestions.
Alternatively, I can hang on to them until the other change hits
mainline, and then queue them up after that.
--
Jens Axboe
next prev parent reply other threads:[~2020-07-17 2:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 9:04 [PATCH -next] rsxx: Convert to DEFINE_SHOW_ATTRIBUTE Qinglang Miao
2020-07-16 15:45 ` Jens Axboe
2020-07-17 1:37 ` miaoqinglang
2020-07-17 2:16 ` Jens Axboe [this message]
2020-07-17 3:51 ` miaoqinglang
2020-09-19 2:14 ` miaoqinglang
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=87a5f046-e77b-af25-6656-c8b075a16edf@kernel.dk \
--to=axboe@kernel.dk \
--cc=gregkh@linuxfoundation.org \
--cc=josh.h.morris@us.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miaoqinglang@huawei.com \
--cc=pjk1939@linux.ibm.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