From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thierry Reding <thierry.reding@gmail•com>,
Dave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>
Cc: broonie@kernel•org,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thierry Reding <treding@nvidia•com>,
Thomas Zimmermann <tzimmermann@suse•de>
Subject: Re: linux-next: manual merge of the drm-tegra tree with the drm tree
Date: Mon, 28 Feb 2022 14:30:28 +1100 [thread overview]
Message-ID: <20220228143028.53fdde86@canb.auug.org.au> (raw)
In-Reply-To: <20220223163007.328242-1-broonie@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1852 bytes --]
Hi all,
On Wed, 23 Feb 2022 16:30:07 +0000 broonie@kernel•org wrote:
>
> Today's linux-next merge of the drm-tegra tree got conflicts in:
>
> drivers/gpu/drm/tegra/dpaux.c
> drivers/gpu/drm/tegra/Kconfig
>
> between commit:
>
> adb9d5a2cc77e ("drm/dp: Move DisplayPort helpers into separate helper module")
>
> from the drm tree and commit:
>
> 8913e1aea4b32 ("drm/tegra: dpaux: Populate AUX bus")
>
> from the drm-tegra 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.
>
> diff --cc drivers/gpu/drm/tegra/Kconfig
> index 18c319b804c00,201f5175ecfec..0000000000000
> --- a/drivers/gpu/drm/tegra/Kconfig
> +++ b/drivers/gpu/drm/tegra/Kconfig
> @@@ -5,7 -5,7 +5,8 @@@ config DRM_TEGR
> depends on COMMON_CLK
> depends on DRM
> depends on OF
> + select DRM_DP_HELPER
> + select DRM_DP_AUX_BUS
> select DRM_KMS_HELPER
> select DRM_MIPI_DSI
> select DRM_PANEL
> diff --cc drivers/gpu/drm/tegra/dpaux.c
> index 8ca500977a46b,d7a731d287d23..0000000000000
> --- a/drivers/gpu/drm/tegra/dpaux.c
> +++ b/drivers/gpu/drm/tegra/dpaux.c
> @@@ -18,7 -18,8 +18,8 @@@
> #include <linux/reset.h>
> #include <linux/workqueue.h>
>
> -#include <drm/drm_dp_helper.h>
> -#include <drm/drm_dp_aux_bus.h>
> +#include <drm/dp/drm_dp_helper.h>
> ++#include <drm/dp/drm_dp_aux_bus.h>
> #include <drm/drm_panel.h>
>
> #include "dp.h"
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-02-28 3:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-23 16:30 linux-next: manual merge of the drm-tegra tree with the drm tree broonie
2022-02-28 3:30 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-16 1:12 Stephen Rothwell
2017-03-21 0:45 Stephen Rothwell
2017-03-21 14:10 ` Thierry Reding
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=20220228143028.53fdde86@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=broonie@kernel$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=thierry.reding@gmail$(echo .)com \
--cc=treding@nvidia$(echo .)com \
--cc=tzimmermann@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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