Em Mon, 2 Mar 2020 15:13:21 -0600
Frank Rowand <frowand.list@xxxxxxxxx> escreveu:
> On 3/2/20 1:59 AM, Mauro Carvalho Chehab wrote:
> > - Add a SPDX header;
> > - Adjust document title;
> > - Some whitespace fixes and new line breaks;
> > - Mark literal blocks as such;
> > - Add it to devicetree/index.rst.
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
> > ---
> > Documentation/devicetree/index.rst | 1 +
> > .../{overlay-notes.txt => overlay-notes.rst} | 141 +++++++++---------
> > MAINTAINERS | 2 +-
> > 3 files changed, 74 insertions(+), 70 deletions(-)
> > rename Documentation/devicetree/{overlay-notes.txt => overlay-notes.rst} (56%)
> >
> > diff --git a/Documentation/devicetree/index.rst b/Documentation/devicetree/index.rst
> > index ca83258fbba5..0669a53fc617 100644
> > --- a/Documentation/devicetree/index.rst
> > +++ b/Documentation/devicetree/index.rst
> > @@ -13,3 +13,4 @@ Open Firmware and Device Tree
> > changesets
> > dynamic-resolution-notes
> > of_unittest
> > + overlay-notes
> > diff --git a/Documentation/devicetree/overlay-notes.txt b/Documentation/devicetree/overlay-notes.rst
> > similarity index 56%
> > rename from Documentation/devicetree/overlay-notes.txt
> > rename to Documentation/devicetree/overlay-notes.rst
> > index 3f20a39e4bc2..7e8e568f64a8 100644
> > --- a/Documentation/devicetree/overlay-notes.txt
> > +++ b/Documentation/devicetree/overlay-notes.rst
>
> There is a collision between 08/12 and a patch I sent a couple of days ago:
>
> https://lore.kernel.org/r/1580171838-1770-1-git-send-email-frowand.list@xxxxxxxxx
Thanks for pointing it! I'll rebase on the top of linux-next tomorrow
and add your patch on my tree before my series, if not merged on -next
before that.
Regards,
Mauro
