On Thu, Nov 29, 2018 at 11:14 AM Christian König <ckoenig.leichtzumerken@xxxxxxxxx> wrote: > > Am 29.11.18 um 17:11 schrieb Sean Paul: > > On Thu, Nov 29, 2018 at 10:58 AM Koenig, Christian > > <Christian.Koenig@xxxxxxx> wrote: > >> Am 29.11.18 um 16:55 schrieb Sean Paul: > >>> From: Sean Paul <seanpaul@xxxxxxxxxxxx> > >>> > >>> Fixes htmldocs build error: > >>> Error: Cannot open file ../drivers/gpu/drm/drm_global.c > >>> > >>> Fixes: 2bb42410b1bd ("drm: Remove drm_global.{c,h} v2") > >>> Cc: Thomas Zimmermann <tzimmermann@xxxxxxx> > >>> Cc: Christian König <christian.koenig@xxxxxxx> > >>> Cc: Junwei Zhang <Jerry.Zhang@xxxxxxx> > >>> Cc: Alex Deucher <alexander.deucher@xxxxxxx> > >>> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > >>> Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> > >>> Cc: Sean Paul <sean@xxxxxxxxxx> > >>> Cc: David Airlie <airlied@xxxxxxxx> > >>> Cc: Christian Koenig <christian.koenig@xxxxxxx> > >>> Cc: Huang Rui <ray.huang@xxxxxxx> > >>> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > >>> Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx> > >> Reviewed-by: Christian König <christian.koenig@xxxxxxx> > >> > > Thanks for the review. Perhaps the best course of action for this > > patch is to have Dave pick it directly and then we can backmerge it > > into amdgpu/drm-misc-next from there? I could also spin a topic branch > > that we could all merge. > > > > Thoughts? > > My preference is that I pick it up and push it to Dave through Alex > fixes push. > > But just because the patch which broke this came the same way as well. > Yeah, unfortunately it's proliferated, and I'd rather not add hops to getting drm-misc-next fixed. Let's just do a topic branch and set a PR to Dave from that. We can both merge the topic branch asap and let Dave pick it up at his leisure. Sean > Either way works for me, > Christian. > > > > > Sean > > > >>> --- > >>> Documentation/gpu/drm-mm.rst | 3 --- > >>> 1 file changed, 3 deletions(-) > >>> > >>> diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst > >>> index d0f3c6b032009..54a696d961a7c 100644 > >>> --- a/Documentation/gpu/drm-mm.rst > >>> +++ b/Documentation/gpu/drm-mm.rst > >>> @@ -79,9 +79,6 @@ count for the TTM, which will call your initialization function. > >>> > >>> See the radeon_ttm.c file for an example of usage. > >>> > >>> -.. kernel-doc:: drivers/gpu/drm/drm_global.c > >>> - :export: > >>> - > >>> > >>> The Graphics Execution Manager (GEM) > >>> ==================================== > > _______________________________________________ > > dri-devel mailing list > > dri-devel@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel