[PATCH 1/2] drm/mcde: Fix reference to DOC comment

[PATCH 1/2] drm/mcde: Fix reference to DOC comment

[Jonathan Neuschäfer]

The :doc: reference did not match the DOC comment's name.

Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE")
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 Documentation/gpu/mcde.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/gpu/mcde.rst b/Documentation/gpu/mcde.rst
index c69e977defda..dd43dde379e0 100644
--- a/Documentation/gpu/mcde.rst
+++ b/Documentation/gpu/mcde.rst
@@ -5,4 +5,4 @@
 =======================================================

 .. kernel-doc:: drivers/gpu/drm/mcde/mcde_drv.c
-   :doc: ST-Ericsson MCDE DRM Driver
+   :doc: ST-Ericsson MCDE Driver
--
2.20.1

[PATCH 2/2] drm/mcde: Fix Sphinx formatting

[Jonathan Neuschäfer]

- Format the pipe diagram as a monospace block.
- Fix formatting of the list. Without the empty line, the first dash is
  not parsed as a bullet point.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 drivers/gpu/drm/mcde/mcde_drv.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c
index 9a09eba53182..c535abed4765 100644
--- a/drivers/gpu/drm/mcde/mcde_drv.c
+++ b/drivers/gpu/drm/mcde/mcde_drv.c
@@ -20,11 +20,11 @@
  * input formats including most variants of RGB and YUV.
  *
  * The hardware has four display pipes, and the layout is a little
- * bit like this:
+ * bit like this::
  *
- * Memory     -> Overlay -> Channel -> FIFO -> 5 formatters -> DSI/DPI
- * External      0..5       0..3       A,B,    3 x DSI         bridge
- * source 0..9                         C0,C1   2 x DPI
+ *   Memory     -> Overlay -> Channel -> FIFO -> 5 formatters -> DSI/DPI
+ *   External      0..5       0..3       A,B,    3 x DSI         bridge
+ *   source 0..9                         C0,C1   2 x DPI
  *
  * FIFOs A and B are for LCD and HDMI while FIFO CO/C1 are for
  * panels with embedded buffer.
@@ -43,6 +43,7 @@
  * to change as we exploit more of the hardware capabilities.
  *
  * TODO:
+ *
  * - Enabled damaged rectangles using drm_plane_enable_fb_damage_clips()
  *   so we can selectively just transmit the damaged area to a
  *   command-only display.
--
2.20.1

Re: [PATCH 1/2] drm/mcde: Fix reference to DOC comment

[Linus Walleij]

On Wed, Oct 2, 2019 at 5:39 PM Jonathan Neuschäfer
<j.neuschaefer@gmx.net> wrote:

> The :doc: reference did not match the DOC comment's name.
>
> Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE")
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>

Both patches applied!

Yours,
Linus Walleij

Re: [PATCH 1/2] drm/mcde: Fix reference to DOC comment

[Linus Walleij]

On Thu, Oct 3, 2019 at 4:34 PM Linus Walleij <linus.walleij@linaro.org> wrote:
> On Wed, Oct 2, 2019 at 5:39 PM Jonathan Neuschäfer
> <j.neuschaefer@gmx.net> wrote:
>
> > The :doc: reference did not match the DOC comment's name.
> >
> > Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE")
> > Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
>
> Both patches applied!

...but I can't push the changes:

$ dim push-branch drm-misc-next
dim: 9fa1f9734e40 ("Revert "drm/sun4i: dsi: Change the start delay
calculation""): committer Signed-off-by missing.
dim: ERROR: issues in commits detected, aborting

Not even my commit, apart from that it looks like it does have
the committer Signed-off-by. I'm confused and don't know what
to do... anyone has some hints?

Linus Walleij

Re: [PATCH 1/2] drm/mcde: Fix reference to DOC comment

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]

Hi,

On Thu, Oct 03, 2019 at 04:39:39PM +0200, Linus Walleij wrote:
> On Thu, Oct 3, 2019 at 4:34 PM Linus Walleij <linus.walleij@linaro.org> wrote:
> > On Wed, Oct 2, 2019 at 5:39 PM Jonathan Neuschäfer
> > <j.neuschaefer@gmx.net> wrote:
> >
> > > The :doc: reference did not match the DOC comment's name.
> > >
> > > Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE")
> > > Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
> >
> > Both patches applied!
>
> ...but I can't push the changes:
>
> $ dim push-branch drm-misc-next
> dim: 9fa1f9734e40 ("Revert "drm/sun4i: dsi: Change the start delay
> calculation""): committer Signed-off-by missing.
> dim: ERROR: issues in commits detected, aborting
>
> Not even my commit, apart from that it looks like it does have
> the committer Signed-off-by. I'm confused and don't know what
> to do... anyone has some hints?

Yeah, it's pretty weird, I just pushed without any trouble.

Did you rebase or something?

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 1/2] drm/mcde: Fix reference to DOC comment

[Linus Walleij]

On Thu, Oct 3, 2019 at 5:15 PM Maxime Ripard <mripard@kernel.org> wrote:

> > > > Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE")
> > > > Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
> > >
> > > Both patches applied!
> >
> > ...but I can't push the changes:
> >
> > $ dim push-branch drm-misc-next
> > dim: 9fa1f9734e40 ("Revert "drm/sun4i: dsi: Change the start delay
> > calculation""): committer Signed-off-by missing.
> > dim: ERROR: issues in commits detected, aborting
> >
> > Not even my commit, apart from that it looks like it does have
> > the committer Signed-off-by. I'm confused and don't know what
> > to do... anyone has some hints?
>
> Yeah, it's pretty weird, I just pushed without any trouble.
>
> Did you rebase or something?

Nope... even tried to reset hard to origin :/

I guess just try again...

Yours,
Linus Walleij