Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the qcom tree with the arm-soc tree
@ 2015-10-11 23:19 Stephen Rothwell
  2015-10-12 16:29 ` Andy Gross
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2015-10-11 23:19 UTC (permalink / raw)
  To: Andy Gross, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Srinivas Kandagatla, Sjoerd Simons

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the qcom tree with the arm-soc tree
  2015-10-11 23:19 linux-next: manual merge of the qcom tree with the arm-soc tree Stephen Rothwell
@ 2015-10-12 16:29 ` Andy Gross
  0 siblings, 0 replies; 3+ messages in thread
From: Andy Gross @ 2015-10-12 16:29 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
	linux-kernel, Srinivas Kandagatla, Sjoerd Simons

On Mon, Oct 12, 2015 at 10:19:12AM +1100, Stephen Rothwell wrote:
> 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


Thanks.  I'll redo that patch based on arm-soc's next before sending the pull
request.  multi_v7 defconfig changes are always a barrel o' fun

-- 
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

^ permalink raw reply	[flat|nested] 3+ messages in thread

* linux-next: manual merge of the qcom tree with the arm-soc tree
@ 2019-11-04 22:39 Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-04 22:39 UTC (permalink / raw)
  To: Andy Gross, Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Bjorn Andersson, Zhou Wang, Wei Xu

[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]

Hi all,

Today's linux-next merge of the qcom tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  af24cb20689d ("arm64: defconfig: Enable HiSilicon ZIP controller")

from the arm-soc tree and commit:

  ca1561a3d8e4 ("arm64: defconfig: Enable Qualcomm pseudo rng")

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 d3a289e12c92,0de751801c98..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -750,8 -749,8 +759,9 @@@ CONFIG_QCOM_SMEM=
  CONFIG_QCOM_SMD_RPM=y
  CONFIG_QCOM_SMP2P=y
  CONFIG_QCOM_SMSM=y
+ CONFIG_QCOM_SOCINFO=m
  CONFIG_ARCH_R8A774A1=y
 +CONFIG_ARCH_R8A774B1=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_R8A7796=y
@@@ -861,7 -860,8 +873,9 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
 +CONFIG_CRYPTO_DEV_HISI_ZIP=m
+ CONFIG_CRYPTO_USER_API_RNG=m
+ CONFIG_CRYPTO_DEV_QCOM_RNG=m
  CONFIG_DMA_CMA=y
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-11 23:19 linux-next: manual merge of the qcom tree with the arm-soc tree Stephen Rothwell
2015-10-12 16:29 ` Andy Gross
2019-11-04 22:39 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git