linux-kernel - Re: linux-next: manual merge of the tegra tree with the qcom tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211221095039.29f8c42e@canb.auug.org.au>
Date:   Tue, 21 Dec 2021 09:50:39 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        Andy Gross <agross@...nel.org>
Cc:     broonie@...nel.org, Colin Cross <ccross@...roid.com>,
        Olof Johansson <olof@...om.net>,
        Thierry Reding <treding@...dia.com>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Dmitry Osipenko <digetx@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Stephan Gerhold <stephan@...hold.net>,
        linux-arm-kernel@...ts.infradead.org
Subject: Re: linux-next: manual merge of the tegra tree with the qcom tree

Hi all,

On Thu, 16 Dec 2021 08:01:00 +0000 broonie@...nel.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 arm-soc and qcom trees.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped