Hi all,
After merging the drm-msm tree, today's linux-next build (arm multi_v7_defconfig) failed like this:
drivers/gpu/drm/msm/dp/dp_display.c:13:10: fatal error: drm/dp/drm_dp_aux_bus.h: No such file or directory 13 | #include <drm/dp/drm_dp_aux_bus.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
c3bf8e21b38a ("drm/msm/dp: Add eDP support via aux_bus")
interacting with commit
da68386d9edb ("drm: Rename dp/ to display/")
from the drm tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell sfr@canb.auug.org.au Date: Thu, 5 May 2022 11:41:09 +1000 Subject: [PATCH] fix up for "drm: Rename dp/ to display/"
Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au --- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index ed4e26ed20e4..c68d6007c2c6 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -10,7 +10,7 @@ #include <linux/component.h> #include <linux/of_irq.h> #include <linux/delay.h> -#include <drm/dp/drm_dp_aux_bus.h> +#include <drm/display/drm_dp_aux_bus.h>
#include "msm_drv.h" #include "msm_kms.h"