From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Gross <agross@kernel•org>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>
Cc: ARM <linux-arm-kernel@lists•infradead.org>,
Bjorn Andersson <andersson@kernel•org>,
Dominik Kobinski <dominikkobinski314@gmail•com>,
Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail•com>,
Jack Matthews <jm5112356@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Luca Weiss <luca@z3ntu•xyz>, Rayyan Ansari <rayyan@ansari•sh>
Subject: linux-next: manual merge of the qcom tree with the arm-soc tree
Date: Mon, 4 Dec 2023 10:03:55 +1100 [thread overview]
Message-ID: <20231204100355.0fb43204@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1388 bytes --]
Hi all,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm/boot/dts/qcom/Makefile
between commits:
00400a98b2c3 ("ARM: dts: qcom: add device tree for Nokia Lumia 735")
8677233e5913 ("ARM: dts: qcom: add device tree for Nokia Lumia 830")
from the arm-soc tree and commit:
be0061dcbac1 ("ARM: dts: qcom: Add support for HTC One Mini 2")
from the qcom 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/arm/boot/dts/qcom/Makefile
index a3d293e40820,c13dddd3c683..000000000000
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@@ -32,8 -29,7 +32,9 @@@ dtb-$(CONFIG_ARCH_QCOM) +=
qcom-msm8916-samsung-e7.dtb \
qcom-msm8916-samsung-grandmax.dtb \
qcom-msm8916-samsung-serranove.dtb \
+ qcom-msm8926-htc-memul.dtb \
+ qcom-msm8926-microsoft-superman-lte.dtb \
+ qcom-msm8926-microsoft-tesla.dtb \
qcom-msm8960-cdp.dtb \
qcom-msm8960-samsung-expressatt.dtb \
qcom-msm8974-lge-nexus5-hammerhead.dtb \
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-12-03 23:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-03 23:03 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-03 23:08 linux-next: manual merge of the qcom tree with the arm-soc tree Stephen Rothwell
2019-11-04 22:39 Stephen Rothwell
2015-10-11 23:19 Stephen Rothwell
2015-10-12 16:29 ` Andy Gross
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=20231204100355.0fb43204@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=dominikkobinski314@gmail$(echo .)com \
--cc=ivo.ivanov.ivanov1@gmail$(echo .)com \
--cc=jm5112356@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=luca@z3ntu$(echo .)xyz \
--cc=olof@lixom$(echo .)net \
--cc=rayyan@ansari$(echo .)sh \
/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