Messages in this thread | | | Subject | Re: [PATCH -next] rsxx: Convert to DEFINE_SHOW_ATTRIBUTE | From | miaoqinglang <> | Date | Sat, 19 Sep 2020 10:14:55 +0800 |
| |
在 2020/7/17 10:16, Jens Axboe 写道: > 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. > Hi Jens,
I resent a new patch against linux-next(20200917), and it can be applied to mainline cleanly now.
Thanks.
> Alternatively, I can hang on to them until the other change hits > mainline, and then queue them up after that. >
| |