[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <664140af-3d95-416c-8f89-cad7beeaac19@sirena.org.uk>
Date: Thu, 13 Apr 2023 17:23:48 +0100
From: Mark Brown <broonie@...nel.org>
To: Gao Xiang <hsiangkao@...ux.alibaba.com>
Cc: Gao Xiang <xiang@...nel.org>,
Christian Brauner <brauner@...nel.org>,
Jingbo Xu <jefflexu@...ux.alibaba.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the erofs tree with the
vfs-idmapping tree
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.
Download attachment "signature.asc" of type "application/pgp-signature" (485 bytes)
Powered by blists - more mailing lists