Messages in this thread | | | Date | Sat, 7 Dec 2019 11:55:40 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the qcom tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
f693ff65c36e ("arm64: defconfig: re-run savedefconfig")
from Linus' tree and commits:
b32576da47af ("arm64: defconfig: Enable Qualcomm remoteproc dependencies") 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 6a83ba2aea3e,0de751801c98..000000000000 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -387,10 -392,12 +389,12 @@@ CONFIG_SPI_MESON_SPIFC= CONFIG_SPI_ORION=y CONFIG_SPI_PL022=y CONFIG_SPI_ROCKCHIP=y + CONFIG_SPI_QCOM_QSPI=m CONFIG_SPI_QUP=y + CONFIG_SPI_QCOM_GENI=m CONFIG_SPI_S3C64XX=y -CONFIG_SPI_SPIDEV=m CONFIG_SPI_SUN6I=y +CONFIG_SPI_SPIDEV=m CONFIG_SPMI=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MAX77620=y @@@ -728,15 -738,19 +734,19 @@@ CONFIG_RPMSG_QCOM_GLINK_SMEM= CONFIG_RPMSG_QCOM_SMD=y CONFIG_RASPBERRYPI_POWER=y CONFIG_IMX_SCU_SOC=y + CONFIG_QCOM_AOSS_QMP=y -CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_GENI_SE=y CONFIG_QCOM_GLINK_SSR=m + CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RPMH=y + CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_SMEM=y 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 @@@ -844,8 -860,9 +856,10 @@@ CONFIG_NLS_ISO8859_1= CONFIG_SECURITY=y CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DEV_SUN8I_CE=m +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 CONFIG_DEBUG_INFO=y [unhandled content-type:application/pgp-signature] | |