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: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>
Subject: linux-next: manual merge of the drm-msm tree with the drm tree
Date: Thu, 5 May 2022 11:01:34 +1000 [thread overview]
Message-ID: <20220505110134.583417b5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]
Hi all,
Today's linux-next merge of the drm-msm tree got a conflict in:
drivers/gpu/drm/msm/Kconfig
between commit:
1e0f66420b13 ("drm/display: Introduce a DRM display-helper module")
from the drm tree and commit:
f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support")
from the drm-msm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/msm/Kconfig
index 864fdc20afef,a6110fc67ac4..000000000000
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@@ -12,8 -12,8 +12,9 @@@ config DRM_MS
select IOMMU_IO_PGTABLE
select QCOM_MDT_LOADER if ARCH_QCOM
select REGULATOR
+ select DRM_DP_AUX_BUS
- select DRM_DP_HELPER
+ select DRM_DISPLAY_DP_HELPER
+ select DRM_DISPLAY_HELPER
select DRM_KMS_HELPER
select DRM_PANEL
select DRM_BRIDGE
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-05 1:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 1:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-05 1:06 linux-next: manual merge of the drm-msm tree with the drm tree Stephen Rothwell
2021-10-05 2:10 Stephen Rothwell
2020-11-05 1:12 Stephen Rothwell
2020-11-05 1:08 Stephen Rothwell
2020-09-21 3:07 Stephen Rothwell
2020-09-18 3:07 Stephen Rothwell
2020-03-20 0:40 Stephen Rothwell
2019-08-14 2:58 Stephen Rothwell
2019-08-14 3:01 ` Stephen Rothwell
2018-12-10 3:03 Stephen Rothwell
2018-07-23 2:40 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=20220505110134.583417b5@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=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).