Merge drm/drm-next into drm-misc-next



Need to pick up the following patch to fix htmldocs build

167bfe53 ("Documentation: drm: Remove dangling pointer from drm-mm.rst")

Signed-off-by: Sean Paul <seanpaul@chromium.org>

parents 2c2853f7 167bfe53

Documentation/gpu/drm-mm.rst

+0 −3

Original line number	Diff line number	Diff line
		@@ -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)
		====================================