* linux-next: manual merge of the tegra tree with the qcom tree
@ 2021-12-16 8:01 broonie
2021-12-20 22:50 ` Stephen Rothwell
2022-03-18 7:27 ` Stephen Rothwell
0 siblings, 2 replies; 6+ messages in thread
From: broonie @ 2021-12-16 8:01 UTC (permalink / raw)
To: Colin Cross, Olof Johansson, Thierry Reding
Cc: Bjorn Andersson, Dmitry Osipenko, Linux Kernel Mailing List,
Linux Next Mailing List, Stephan Gerhold, linux-arm-kernel
Hi all,
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the tegra tree with the qcom tree
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
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-12-20 22:50 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, Andy Gross
Cc: broonie, Colin Cross, Olof Johansson, Thierry Reding,
Bjorn Andersson, Dmitry Osipenko, Linux Kernel Mailing List,
Linux Next Mailing List, Stephan Gerhold, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 1485 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 arm-soc and qcom trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the tegra tree with the qcom tree
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
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2022-03-18 7:27 UTC (permalink / raw)
To: Andy Gross
Cc: broonie, Colin Cross, Olof Johansson, Thierry Reding,
Bjorn Andersson, Dmitry Osipenko, Linux Kernel Mailing List,
Linux Next Mailing List, Stephan Gerhold, linux-arm-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tegra tree with the qcom tree
@ 2022-11-13 21:47 Stephen Rothwell
2022-11-21 23:46 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2022-11-13 21:47 UTC (permalink / raw)
To: Colin Cross, Olof Johansson, Thierry Reding, Andy Gross
Cc: Bjorn Andersson, Dipen Patel, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
c03fa428ac6e ("arm64: defconfig: build-in Qualcomm SC7180 and SM8450 interconnects")
from the qcom tree and commit:
b4c8adc40f49 ("arm64: defconfig: Enable HTE config")
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.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index f910ccaaecf9,9ccc82e180c7..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1312,7 -1310,10 +1316,10 @@@ CONFIG_INTERCONNECT_QCOM_SDM845=
CONFIG_INTERCONNECT_QCOM_SM8150=m
CONFIG_INTERCONNECT_QCOM_SM8250=m
CONFIG_INTERCONNECT_QCOM_SM8350=m
-CONFIG_INTERCONNECT_QCOM_SM8450=m
+CONFIG_INTERCONNECT_QCOM_SM8450=y
+ CONFIG_HTE=y
+ CONFIG_HTE_TEGRA194=y
+ CONFIG_HTE_TEGRA194_TEST=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the tegra tree with the qcom tree
2022-11-13 21:47 Stephen Rothwell
@ 2022-11-21 23:46 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2022-11-21 23:46 UTC (permalink / raw)
To: Olof Johansson, Andy Gross, Arnd Bergmann
Cc: Colin Cross, Thierry Reding, Bjorn Andersson, Dipen Patel,
Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List, ARM
[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]
Hi all,
On Mon, 14 Nov 2022 08:47:38 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tegra tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> c03fa428ac6e ("arm64: defconfig: build-in Qualcomm SC7180 and SM8450 interconnects")
>
> from the qcom tree and commit:
>
> b4c8adc40f49 ("arm64: defconfig: Enable HTE config")
>
> 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/arm64/configs/defconfig
> index f910ccaaecf9,9ccc82e180c7..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -1312,7 -1310,10 +1316,10 @@@ CONFIG_INTERCONNECT_QCOM_SDM845=
> CONFIG_INTERCONNECT_QCOM_SM8150=m
> CONFIG_INTERCONNECT_QCOM_SM8250=m
> CONFIG_INTERCONNECT_QCOM_SM8350=m
> -CONFIG_INTERCONNECT_QCOM_SM8450=m
> +CONFIG_INTERCONNECT_QCOM_SM8450=y
> + CONFIG_HTE=y
> + CONFIG_HTE_TEGRA194=y
> + CONFIG_HTE_TEGRA194_TEST=m
> CONFIG_EXT2_FS=y
> CONFIG_EXT3_FS=y
> CONFIG_EXT4_FS_POSIX_ACL=y
This is now a conflict between the qcom tree and the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tegra tree with the qcom tree
@ 2025-07-10 0:49 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2025-07-10 0:49 UTC (permalink / raw)
To: Colin Cross, Thierry Reding, Andy Gross
Cc: Bjorn Andersson, Bjorn Andersson, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
3871b51a6842 ("arm64: defconfig: Enable Qualcomm CPUCP mailbox driver")
from the qcom tree and commit:
18c590e012d3 ("arm64: defconfig: Enable Tegra HSP and BPMP")
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.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index 42b33f998149,cf3856dfed22..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1457,7 -1445,7 +1458,8 @@@ CONFIG_PLATFORM_MHU=
CONFIG_BCM2835_MBOX=y
CONFIG_QCOM_APCS_IPC=y
CONFIG_MTK_ADSP_MBOX=m
+CONFIG_QCOM_CPUCP_MBOX=m
+ CONFIG_TEGRA_HSP_MBOX=y
CONFIG_QCOM_IPCC=y
CONFIG_ROCKCHIP_IOMMU=y
CONFIG_TEGRA_IOMMU_SMMU=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-07-10 0:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox