From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Gross <agross@codeaurora•org>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>,
Sjoerd Simons <sjoerd.simons@collabora•co.uk>
Subject: linux-next: manual merge of the qcom tree with the arm-soc tree
Date: Mon, 12 Oct 2015 10:19:12 +1100 [thread overview]
Message-ID: <20151012101912.33e77590@canb.auug.org.au> (raw)
Hi Andy,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commits:
b605aded4491 ("ARM: multi_v7_defconfig: Add missing QCOM APQ8064 configs")
cc68819a582c ("ARM: multi_v7_defconfig: Enable Rockchip display support")
from the arm-soc tree and commit:
4e7fb93081f8 ("ARM: multi_v7_defconfig: Enable QCOM SMD/RPM")
from the qcom tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/configs/multi_v7_defconfig
index 0af319ec7047,41aecd75e2aa..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -425,7 -415,7 +425,8 @@@ CONFIG_REGULATOR_MAX77802=
CONFIG_REGULATOR_PALMAS=y
CONFIG_REGULATOR_PBIAS=y
CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_RPM=y
+ CONFIG_REGULATOR_QCOM_SMD_RPM=y
CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_REGULATOR_TPS51632=y
@@@ -645,7 -631,7 +649,8 @@@ CONFIG_APQ_MMCC_8084=
CONFIG_MSM_GCC_8660=y
CONFIG_MSM_MMCC_8960=y
CONFIG_MSM_MMCC_8974=y
+CONFIG_ROCKCHIP_IOMMU=y
+ CONFIG_HWSPINLOCK_QCOM=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_PM_DEVFREQ=y
next reply other threads:[~2015-10-11 23:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 23:19 Stephen Rothwell [this message]
2015-10-12 16:29 ` linux-next: manual merge of the qcom tree with the arm-soc tree Andy Gross
-- strict thread matches above, loose matches on Subject: below --
2019-11-04 22:39 Stephen Rothwell
2023-12-03 23:03 Stephen Rothwell
2023-12-03 23:08 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=20151012101912.33e77590@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@codeaurora$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--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=sjoerd.simons@collabora$(echo .)co.uk \
--cc=srinivas.kandagatla@linaro$(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