[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200304140110.1951004f@lwn.net>
Date: Wed, 4 Mar 2020 14:01:10 -0700
From: Jonathan Corbet <corbet@....net>
To: Lukas Bulwahn <lukas.bulwahn@...il.com>
Cc: Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
linux-doc@...r.kernel.org, linux-fsdevel@...r.kernel.org,
Joe Perches <joe@...ches.com>, kernel-janitors@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] MAINTAINERS: adjust to filesystem doc ReST conversion
On Wed, 4 Mar 2020 21:50:39 +0100 (CET)
Lukas Bulwahn <lukas.bulwahn@...il.com> 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
Powered by blists - more mailing lists