From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Gross <agross@kernel•org>
Cc: broonie@kernel•org, Colin Cross <ccross@android•com>,
Olof Johansson <olof@lixom•net>,
Thierry Reding <treding@nvidia•com>,
Bjorn Andersson <bjorn.andersson@linaro•org>,
Dmitry Osipenko <digetx@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Stephan Gerhold <stephan@gerhold•net>,
linux-arm-kernel@lists•infradead.org
Subject: Re: linux-next: manual merge of the tegra tree with the qcom tree
Date: Fri, 18 Mar 2022 18:27:04 +1100 [thread overview]
Message-ID: <20220318182704.22cfa5d5@canb.auug.org.au> (raw)
In-Reply-To: <20211216080100.3496490-1-broonie@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
Hi all,
On Thu, 16 Dec 2021 08:01:00 +0000 broonie@kernel•org wrote:
>
> Today's linux-next merge of the tegra tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commit:
>
> 7495af9308354 ("ARM: multi_v7_defconfig: Enable drivers for DragonBoard 410c")
>
> from the qcom tree and commit:
>
> ca1f7d245f530 ("ARM: config: multi v7: Enable display drivers used by Tegra devices")
>
> from the 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 arch/arm/configs/multi_v7_defconfig
> index ae227d309dc1b,3d509bc134440..0000000000000
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@@ -705,7 -690,7 +708,8 @@@ CONFIG_DRM_PANEL_ORISETECH_OTM8009A=
> CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
> CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
> CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
> +CONFIG_DRM_DISPLAY_CONNECTOR=m
> + CONFIG_DRM_LVDS_CODEC=m
> CONFIG_DRM_NXP_PTN3460=m
> CONFIG_DRM_PARADE_PS8622=m
> CONFIG_DRM_SII902X=m
This is now a conflict between the qcom 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-03-18 7:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 8:01 linux-next: manual merge of the tegra tree with the qcom tree broonie
2021-12-20 22:50 ` Stephen Rothwell
2022-03-18 7:27 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-13 21:47 Stephen Rothwell
2022-11-21 23:46 ` Stephen Rothwell
2025-07-10 0:49 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=20220318182704.22cfa5d5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@kernel$(echo .)org \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=ccross@android$(echo .)com \
--cc=digetx@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=stephan@gerhold$(echo .)net \
--cc=treding@nvidia$(echo .)com \
/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