lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 14 Nov 2016 16:20:26 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Bjorn Andersson <bjorn.andersson@...aro.org>, Vinod Koul <vinod.koul@...el.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Peter Griffin <peter.griffin@...aro.org> Subject: linux-next: manual merge of the rpmsg tree with the slave-dma tree Hi Bjorn, Today's linux-next merge of the rpmsg tree got a conflict in: drivers/remoteproc/Kconfig between commit: bb6869b21478 ("remoteproc: st_slim_rproc: add a slimcore rproc driver") from the slave-dma tree and commit: 99d93470dcb4 ("remoteproc: qcom_wcnss: Fix circular module dependency") from the rpmsg 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 drivers/remoteproc/Kconfig index 14d5d2d43a38,5fcbefcb8636..000000000000 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@@ -100,10 -95,9 +96,9 @@@ config QCOM_WCNSS_PI tristate "Qualcomm WCNSS Peripheral Image Loader" depends on OF && ARCH_QCOM depends on QCOM_SMEM + depends on REMOTEPROC select QCOM_MDT_LOADER select QCOM_SCM - select QCOM_WCNSS_IRIS - select REMOTEPROC help Say y here to support the Peripheral Image Loader for the Qualcomm Wireless Connectivity Subsystem.
Powered by blists - more mailing lists