www.infradead.org Git - users/jedix/linux-maple.git/commit

author	Lucas De Marchi <lucas.demarchi@intel.com>
	Mon, 4 Nov 2024 18:31:04 +0000 (10:31 -0800)
committer	Lucas De Marchi <lucas.demarchi@intel.com>
	Tue, 5 Nov 2024 06:36:02 +0000 (22:36 -0800)
commit	be15f0bc4a95e681466b2cfa1ceb86a9e38c5be6
tree	e50690b1f6c20e256e8735049150ce8f73aa0f6d	tree
parent	c787c2901e2c03008e536b86cb0103ce6fd05e2d	commit \| diff

drm/xe: Fix drm-next merge

Fix merge in commit c787c2901e2c ("Merge drm/drm-next into
drm-xe-next"). That workaround needs to be done only once.

While at it, also remove undesired newline before checking for error.

Fixes: c787c2901e2c ("Merge drm/drm-next into drm-xe-next")
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241104183104.2265275-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>