Re: linux-next: manual merge of the erofs tree with the vfs-idmapping tree

[Mark Brown]

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@xxxxxxxxxxxxxxxx

> 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.

Attachment: signature.asc
Description: PGP signature