| Message ID | 699d7618720e2808f9aa094a13ab2f3545c3c25c.1561565652.git.mchehab+samsung@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: fix a reference for a renamed file: fb/modedb.rst | expand |
On Wed, Jun 26, 2019 at 01:14:13PM -0300, Mauro Carvalho Chehab wrote: > Due to two patches being applied about the same time, the > reference for modedb.rst file got wrong: > > Documentation/fb/modedb.txt is now Documentation/fb/modedb.rst. > > Fixes: 1bf4e09227c3 ("drm/modes: Allow to specify rotation and reflection on the commandline") > Fixes: ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst") > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> What's the merge plan here? doc-next? If so: Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_modes.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index 57e6408288c8..4645af681ef8 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -1680,7 +1680,7 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len, > * > * Additionals options can be provided following the mode, using a comma to > * separate each option. Valid options can be found in > - * Documentation/fb/modedb.txt. > + * Documentation/fb/modedb.rst. > * > * The intermediate drm_cmdline_mode structure is required to store additional > * options from the command line modline like the force-enable/disable flag. > -- > 2.21.0 >
On Wed, 26 Jun 2019 23:27:35 +0200 Daniel Vetter <daniel@ffwll.ch> wrote: > On Wed, Jun 26, 2019 at 01:14:13PM -0300, Mauro Carvalho Chehab wrote: > > Due to two patches being applied about the same time, the > > reference for modedb.rst file got wrong: > > > > Documentation/fb/modedb.txt is now Documentation/fb/modedb.rst. > > > > Fixes: 1bf4e09227c3 ("drm/modes: Allow to specify rotation and reflection on the commandline") > > Fixes: ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst") > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > What's the merge plan here? doc-next? If so: > > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> It doesn't really apply to docs-next, so that's probably not the best path unless I hold it until after the merge window. Seems like it needs to go through the DRM tree to me. Thanks, jon
On Thu, Jun 27, 2019 at 7:31 PM Jonathan Corbet <corbet@lwn.net> wrote: > > On Wed, 26 Jun 2019 23:27:35 +0200 > Daniel Vetter <daniel@ffwll.ch> wrote: > > > On Wed, Jun 26, 2019 at 01:14:13PM -0300, Mauro Carvalho Chehab wrote: > > > Due to two patches being applied about the same time, the > > > reference for modedb.rst file got wrong: > > > > > > Documentation/fb/modedb.txt is now Documentation/fb/modedb.rst. > > > > > > Fixes: 1bf4e09227c3 ("drm/modes: Allow to specify rotation and reflection on the commandline") > > > Fixes: ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst") > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > > > What's the merge plan here? doc-next? If so: > > > > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > It doesn't really apply to docs-next, so that's probably not the best > path unless I hold it until after the merge window. Seems like it needs > to go through the DRM tree to me. fbdev isn't in drm (yet), so I don't think it applies here eithe. I guess we need to wait until after -rc1 with this one. Topic branch/merge seems a bit overkill here. -Daniel
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 57e6408288c8..4645af681ef8 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1680,7 +1680,7 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len, * * Additionals options can be provided following the mode, using a comma to * separate each option. Valid options can be found in - * Documentation/fb/modedb.txt. + * Documentation/fb/modedb.rst. * * The intermediate drm_cmdline_mode structure is required to store additional * options from the command line modline like the force-enable/disable flag.
Due to two patches being applied about the same time, the reference for modedb.rst file got wrong: Documentation/fb/modedb.txt is now Documentation/fb/modedb.rst. Fixes: 1bf4e09227c3 ("drm/modes: Allow to specify rotation and reflection on the commandline") Fixes: ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst") Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> --- drivers/gpu/drm/drm_modes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)