Re: [PATCH] MAINTAINERS: add tree location for staging/erofs

[Gao Xiang <gaoxiang25@huawei.com>]

Hi Thomas,

On 2018/9/10 23:59, Chao Yu wrote:
> On 2018/9/10 11:56, Gao Xiang wrote:
>>
>>
>> On 2018/9/10 2:34, Thomas Weißschuh wrote:
>>> Hi Chao, hi Gao,
>>>
>>> On Sun, 2018-09-09T23:16+0800, Chao Yu wrote:
>>>> Hi Thomas,
>>>>
>>>> On 2018/9/8 11:28, Gao Xiang wrote:
>>>>> Hi Thomas,
>>>>>
>>>>> Thanks for your new patch.
>>>>>
>>>>> It seems that this patch also introduces 2 new 'WARNING: line over 80 characters',
>>>>> could you please fix it in the patch?
>>>
>>> @Chao,Gao: For some reason there seems to be a problem when receiving mails
>>> from you. The one I received now was the first one from you that reached me
>>> directly. Before I only got your messages in the quotes from Dan and now in the
>>> quotes from the mail I am responding to.
>>> (I will try to investigate the reason for this)
>>>
>>> Sorry for my slow responses before.
>>>
>>>> It will be better to fix that.
>>>
>>> A new patch will shortly follow.
>>>
>>>> Some reviewed cleanup patches are merged before this patch, then I failed to add
>>>> this one, so could you rebase on top of erofs dev branch in below link:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/log/?h=erofs
>>>
>>> I was not aware of this tree and worked off of staging / next.
>>> A patch is attached to this message that adds the tree to the MAINTAINERS file.
>>
>> Hi Chao,
>>
>> I think this tree has some PREVIEW patches which preview in linux-erofs mailing list only and
>> doesn't send to staging mailing list and LKML,
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/log/?h=erofs
>>
>> so erofs tree is actually Greg's staging tree.
> 
> Thomas,
> 
> I confirmed that erofs git repository for linux upstream is Greg's staging tree.
> 
> Let me explain, in order to avoid sending buggy or preview patch, Xiang and me
> plan to review patches in erofs mailing list first, and then cache reviewed
> patches in my git tree before sending them to Greg and staging mailing list.
> 
> Based on that, I'm trying to serialize all erofs patches, expecting that can
> help those patches sent to staging mailing list can be merged by Greg with
> lesser conflict. But I made a mistake that my erofs branch has merged some
> pending patches, result in failing to merge yours, that mislead me to ask you to
> rebase the code, sorry about that.

As Chao's said, we keep on fetching the latest Greg's staging tree and develop
, preview, and test new erofs features and bugfix based on it.

For the cleanup patches, it could be better directly based on Greg's upstream
staging tree. We will then rebase our developping code on your work. :)

> 
> Now I can confirm that your v2 patch can apply on Greg's staging-next, so fixing
> warning reported by checkpatch.pl on your v2 patch is enough. :)

Yes, we are sorry about that. could you please send v4 patch which follows Greg's
and Chao's suggestions?

Thanks,
Gao Xiang

> 
> Thanks,
> 
>>
>>>
>>> -- >8 --
>>>
>>> Currently this location is not documented.
>>>
>>> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
>>> ---
>>>  MAINTAINERS | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index a5b256b25905..9087e0b74821 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -13747,6 +13747,7 @@ F:	drivers/staging/comedi/
>>>  STAGING - EROFS FILE SYSTEM
>>>  M:	Gao Xiang <gaoxiang25@huawei.com>
>>>  M:	Chao Yu <yuchao0@huawei.com>
>>> +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git erofs
>>
>> Hi Thomas,
>> nope, the erofs tree is actually the same as staging tree, so any patch should be based
>> on Greg's upstream tree.
>>
>> Thanks,
>> Gao Xiang
>>
>>>  L:	linux-erofs@lists.ozlabs.org
>>>  S:	Maintained
>>>  F:	drivers/staging/erofs/
>>>