Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <c52808f1-0f4d-9bc3-9faa-0e262d28dac1@linux.alibaba.com>
Date:   Fri, 14 Apr 2023 00:27:28 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.9.1
Subject: Re: linux-next: manual merge of the erofs tree with the vfs-idmapping
 tree
To:     Mark Brown <broonie@kernel.org>
Cc:     Gao Xiang <xiang@kernel.org>,
        Christian Brauner <brauner@kernel.org>,
        Jingbo Xu <jefflexu@linux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20230413144651.3519980-1-broonie@kernel.org>
 <4f9fdec2-cc2a-4bc7-9ddc-87809395f493@sirena.org.uk>
 <699f01a7-8c0e-98d9-d2c7-eaf08552f543@linux.alibaba.com>
 <664140af-3d95-416c-8f89-cad7beeaac19@sirena.org.uk>
From:   Gao Xiang <hsiangkao@linux.alibaba.com>
In-Reply-To: <664140af-3d95-416c-8f89-cad7beeaac19@sirena.org.uk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 2023/4/14 00:23, Mark Brown wrote:
> On Fri, Apr 14, 2023 at 12:16:46AM +0800, Gao Xiang wrote:
> 
>> Thanks.  Actually I didn't update the corresponind xattr patches (just
>> rebase some older commits, also I'd like to avoid in the future, but
>> sometimes it's impossible at least if some RVB is added...)
> 
>> I think it could be resolved as before by Stephen:
>> https://lore.kernel.org/r/20230412101942.75e3efa9@canb.auug.org.au
> 
>> And which looks the same as below:
> 
> Probably some context changed which caused me to have to reresolve the
> conflict?  Or perhaps just rerere not syncing properly from Stephen's
> work.

Not sure.. I didn't change the file itself.

Anyway, thanks for the efforts and time!

Thanks,
Gao Xiang