Re: [PATCH] MAINTAINERS: adjust to filesystem doc ReST conversion
From: Jonathan Corbet
Date: Wed Mar 04 2020 - 16:01:13 EST
On Wed, 4 Mar 2020 21:50:39 +0100 (CET)
Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> wrote:
> > Thanks for fixing these, but ... what tree did you generate the patch
> > against? I doesn't come close to applying to docs-next.
> >
>
> My patch was based on next-20200303, probably too much noise on
> MAINTAINERS, such that it does not apply cleanly on docs-next.
> If you want, I can send a patch that fits to docs-next. Anyway, merging
> will be similarly difficult later :(
Merge conflicts in MAINTAINERS are almost always trivial to resolve -
Stephen won't mind :)
Thanks,
jon