From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Gross <agross@codeaurora•org>,
Kevin Hilman <khilman@baylibre•com>,
Carlo Caione <carlo@caione•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jerome Brunet <jbrunet@baylibre•com>,
Amit Kucheria <amit.kucheria@linaro•org>
Subject: linux-next: manual merge of the qcom tree with the amlogic tree
Date: Tue, 13 Mar 2018 08:45:16 +1100 [thread overview]
Message-ID: <20180313084516.49718221@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1130 bytes --]
Hi Andy,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
266c157de3b2 ("arm64: defconfig: enable MESON EFUSE")
from the amlogic tree and commit:
52fe48c2b9bb ("arm64: defconfig: enable thermal sensor on QCOM platforms")
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/arm64/configs/defconfig
index df2b08b1554f,a37130b54fae..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -565,7 -572,7 +575,8 @@@ CONFIG_PHY_XGENE=
CONFIG_PHY_TEGRA_XUSB=y
CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
+CONFIG_MESON_EFUSE=m
+ CONFIG_QCOM_QFPROM=y
CONFIG_UNIPHIER_EFUSE=y
CONFIG_TEE=y
CONFIG_OPTEE=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-03-12 21:45 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=20180313084516.49718221@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@codeaurora$(echo .)org \
--cc=amit.kucheria@linaro$(echo .)org \
--cc=carlo@caione$(echo .)org \
--cc=jbrunet@baylibre$(echo .)com \
--cc=khilman@baylibre$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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