All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Clark <robdclark@gmail.com>,
	Sean Paul <seanpaul@chromium.org>, Dave Airlie <airlied@linux.ie>
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	Sankeerth Billakanti <quic_sbillaka@quicinc.com>,
	DRI <dri-devel@lists.freedesktop.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the drm-msm tree
Date: Thu, 5 May 2022 11:43:11 +1000	[thread overview]
Message-ID: <20220505114311.18e7786f@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

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"
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Clark <robdclark@gmail.com>,
	Sean Paul <seanpaul@chromium.org>, Dave Airlie <airlied@linux.ie>
Cc: Sankeerth Billakanti <quic_sbillaka@quicinc.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	DRI <dri-devel@lists.freedesktop.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Subject: linux-next: build failure after merge of the drm-msm tree
Date: Thu, 5 May 2022 11:43:11 +1000	[thread overview]
Message-ID: <20220505114311.18e7786f@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

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"
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2022-05-05  1:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-05  1:43 Stephen Rothwell [this message]
2022-05-05  1:43 ` linux-next: build failure after merge of the drm-msm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-12-11  0:59 Stephen Rothwell
2023-12-11  0:59 ` Stephen Rothwell
2023-10-10  1:54 Stephen Rothwell
2022-05-05  1:48 Stephen Rothwell
2022-05-05  1:48 ` Stephen Rothwell
2021-07-29 11:28 Mark Brown
2021-06-18  2:42 Stephen Rothwell
2021-06-18  2:50 ` Stephen Rothwell
2021-06-23  1:02   ` Stephen Rothwell
2018-10-05  1:37 Stephen Rothwell
2018-07-23  4:50 Stephen Rothwell
2018-07-23  4:50 ` Stephen Rothwell
2018-07-25 12:08 ` Rob Clark
2018-07-25 12:08   ` Rob Clark
2018-06-04  3:20 Stephen Rothwell
2016-07-11  3:20 Stephen Rothwell
2015-12-15  1:27 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220505114311.18e7786f@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=quic_sbillaka@quicinc.com \
    --cc=robdclark@gmail.com \
    --cc=seanpaul@chromium.org \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.