From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Matthias Brugger <matthias.bgg@gmail•com>,
Shawn Guo <shawnguo@kernel•org>
Cc: Enric Balletbo i Serra <enric.balletbo@collabora•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Michael Walle <michael@walle•cc>
Subject: linux-next: manual merge of the mediatek tree with the imx-mxs tree
Date: Thu, 1 Apr 2021 09:20:27 +1100 [thread overview]
Message-ID: <20210401092027.1e4c8b05@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1171 bytes --]
Hi all,
Today's linux-next merge of the mediatek tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
94c586e5941a ("arm64: configs: enable FlexTimer alarm timer")
from the imx-mxs tree and commit:
fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot from usb")
from the mediatek 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 ec94b0438ab2,f2dc42c9b932..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -996,7 -998,7 +1006,8 @@@ CONFIG_OWL_PM_DOMAINS=
CONFIG_RASPBERRYPI_POWER=y
CONFIG_FSL_DPAA=y
CONFIG_FSL_MC_DPIO=y
+CONFIG_FSL_RCPM=y
+ CONFIG_MTK_PMIC_WRAP=y
CONFIG_QCOM_AOSS_QMP=y
CONFIG_QCOM_COMMAND_DB=y
CONFIG_QCOM_GENI_SE=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2021-03-31 22:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210401092027.1e4c8b05@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=enric.balletbo@collabora$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matthias.bgg@gmail$(echo .)com \
--cc=michael@walle$(echo .)cc \
--cc=shawnguo@kernel$(echo .)org \
/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