From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Andy Gross <agross@kernel•org>,
Arnd Bergmann <arnd@arndb•de>
Cc: Colin Cross <ccross@android•com>,
Thierry Reding <treding@nvidia•com>,
Bjorn Andersson <andersson@kernel•org>,
Dipen Patel <dipenp@nvidia•com>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
ARM <linux-arm-kernel@lists•infradead.org>
Subject: Re: linux-next: manual merge of the tegra tree with the qcom tree
Date: Tue, 22 Nov 2022 10:46:13 +1100 [thread overview]
Message-ID: <20221122104613.44ee5281@canb.auug.org.au> (raw)
In-Reply-To: <20221114084738.73dff88c@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2022-11-21 23:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 21:47 linux-next: manual merge of the tegra tree with the qcom tree Stephen Rothwell
2022-11-21 23:46 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-10 0:49 Stephen Rothwell
2021-12-16 8:01 broonie
2021-12-20 22:50 ` Stephen Rothwell
2022-03-18 7:27 ` 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=20221122104613.44ee5281@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@kernel$(echo .)org \
--cc=andersson@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=ccross@android$(echo .)com \
--cc=dipenp@nvidia$(echo .)com \
--cc=krzysztof.kozlowski@linaro$(echo .)org \
--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=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