[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <87a5f046-e77b-af25-6656-c8b075a16edf@kernel.dk>
Date: Thu, 16 Jul 2020 20:16:33 -0600
From: Jens Axboe <axboe@...nel.dk>
To: miaoqinglang <miaoqinglang@...wei.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Joshua Morris <josh.h.morris@...ibm.com>,
Philip Kelleher <pjk1939@...ux.ibm.com>
Cc: linux-block@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH -next] rsxx: Convert to DEFINE_SHOW_ATTRIBUTE
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@...wei.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
Powered by blists - more mailing lists