This patch fixed 'make xmldocs' failed on linus's tree and linux-next as of 8th/Aug,2014.
When drm merge for 3.17-rc1 happen, a file was renamed from drm_stub.c to drm_drv.c. But Documentation/DocBook/drm.tmpl still have an old file name.
Signed-off-by: Masanari Iida standby24x7@gmail.com --- Documentation/DocBook/drm.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 1d3756d..bacefc5 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -315,7 +315,7 @@ char *date;</synopsis> <function>drm_dev_unregister()</function> followed by a call to <function>drm_dev_unref()</function>. </para> -!Edrivers/gpu/drm/drm_stub.c +!Edrivers/gpu/drm/drm_drv.c </sect2> <sect2> <title>Driver Load</title>
On 08/08/14 12:16, Masanari Iida wrote:
This patch fixed 'make xmldocs' failed on linus's tree and linux-next as of 8th/Aug,2014.
When drm merge for 3.17-rc1 happen, a file was renamed from drm_stub.c to drm_drv.c. But Documentation/DocBook/drm.tmpl still have an old file name.
Signed-off-by: Masanari Iida standby24x7@gmail.com
Acked-by: Randy Dunlap rdunlap@infradead.org
Thanks.
Linus, please merge as it fixes a DocBook build error.
Documentation/DocBook/drm.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 1d3756d..bacefc5 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -315,7 +315,7 @@ char *date;</synopsis> <function>drm_dev_unregister()</function> followed by a call to <function>drm_dev_unref()</function>. </para> -!Edrivers/gpu/drm/drm_stub.c +!Edrivers/gpu/drm/drm_drv.c </sect2> <sect2> <title>Driver Load</title>
This patch fixed 'make xmldocs' failed on linus's tree and linux-next as of 8th/Aug,2014.
When drm merge for 3.17-rc1 happen, a file was renamed from drm_stub.c to drm_drv.c. But Documentation/DocBook/drm.tmpl still have an old file name.
Signed-off-by: Masanari Iida standby24x7@gmail.com Signed-off-by: Randy Dunlap rdunlap@infradead.org --- Documentation/DocBook/drm.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Linus, please merge since it fixes a fatal DocBook error.
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 1d3756d..bacefc5 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -315,7 +315,7 @@ char *date;</synopsis> <function>drm_dev_unregister()</function> followed by a call to <function>drm_dev_unref()</function>. </para> -!Edrivers/gpu/drm/drm_stub.c +!Edrivers/gpu/drm/drm_drv.c </sect2> <sect2> <title>Driver Load</title>
On Tue, Aug 12, 2014 at 2:30 PM, Randy Dunlap rdunlap@infradead.org wrote:
This patch fixed 'make xmldocs' failed on linus's tree and linux-next as of 8th/Aug,2014.
When drm merge for 3.17-rc1 happen, a file was renamed from drm_stub.c to drm_drv.c. But Documentation/DocBook/drm.tmpl still have an old file name.
Signed-off-by: Masanari Iida standby24x7@gmail.com Signed-off-by: Randy Dunlap rdunlap@infradead.org
Isn't the From field missing to indicate Masanari's authorship of this patch?
On 08/12/14 18:17, Fabio Estevam wrote:
On Tue, Aug 12, 2014 at 2:30 PM, Randy Dunlap rdunlap@infradead.org wrote:
This patch fixed 'make xmldocs' failed on linus's tree and linux-next as of 8th/Aug,2014.
When drm merge for 3.17-rc1 happen, a file was renamed from drm_stub.c to drm_drv.c. But Documentation/DocBook/drm.tmpl still have an old file name.
Signed-off-by: Masanari Iida standby24x7@gmail.com Signed-off-by: Randy Dunlap rdunlap@infradead.org
Isn't the From field missing to indicate Masanari's authorship of this patch?
Hm, yes, I'm afraid that it is. Sorry about that.
If Linus doesn't merge it, I'll add it to my patch queue or David Airlie can do that as well.
Thanks.
On 08/08/14 12:16, Masanari Iida wrote:
This patch fixed 'make xmldocs' failed on linus's tree and linux-next as of 8th/Aug,2014.
When drm merge for 3.17-rc1 happen, a file was renamed from drm_stub.c to drm_drv.c. But Documentation/DocBook/drm.tmpl still have an old file name.
Signed-off-by: Masanari Iida standby24x7@gmail.com
Applied to my patch queue. Thanks.
Documentation/DocBook/drm.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 1d3756d..bacefc5 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -315,7 +315,7 @@ char *date;</synopsis> <function>drm_dev_unregister()</function> followed by a call to <function>drm_dev_unref()</function>. </para> -!Edrivers/gpu/drm/drm_stub.c +!Edrivers/gpu/drm/drm_drv.c </sect2> <sect2> <title>Driver Load</title>
dri-devel@lists.freedesktop.org