Hi all, Today's linux-next merge of the drm tree got a conflict in:
drivers/firmware/qcom/Kconfig
between commits:
618aedff70fbe ("firmware: QCOM interfaces should depend on ARCH_QCOM")
50508d3e0abd8 ("firmware: qcom: scm: Hide QCOM_SCM instead of depending on
ARCH_QCOM")
from the qcom tree and commit:
8fecd3194de33 ("firmware: QCOM interfaces should depend on ARCH_QCOM")
from the drm 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.
diff --combined drivers/firmware/qcom/Kconfig
index 3ad22f8fc3e5f,691db0ded8e8c..0000000000000
--- a/drivers/firmware/qcom/Kconfig
+++ b/drivers/firmware/qcom/Kconfig
@@@ -26,7 -26,8 +26,7 @@@ config QCOM_PAS_TE
by the firmware TEE implementation as the backend.
config QCOM_SCM
- tristate "Qualcomm PAS SCM interface driver"
- depends on ARCH_QCOM || COMPILE_TEST
+ tristate "Qualcomm PAS SCM interface driver" if ARCH_QCOM ||
COMPILE_TEST
select QCOM_PAS
select QCOM_TZMEM
default y if ARCH_QCOM
@@@ -35,17 -36,33 +35,17 @@@ config QCOM_TZME
tristate
select GENERIC_ALLOCATOR
-choice
- prompt "TrustZone interface memory allocator mode"
- depends on QCOM_TZMEM
- default QCOM_TZMEM_MODE_GENERIC
- help
- Selects the mode of the memory allocator providing memory buffers of
- suitable format for sharing with the TrustZone. If in doubt, select
- 'Generic'.
-
-config QCOM_TZMEM_MODE_GENERIC
- bool "Generic"
- help
- Use the generic allocator mode. The memory is page-aligned,
non-cachable
- and physically contiguous.
-
config QCOM_TZMEM_MODE_SHMBRIDGE
- bool "SHM Bridge"
+ bool "TrustZone interface memory allocator: SHM Bridge"
+ depends on QCOM_TZMEM
help
- Use Qualcomm Shared Memory Bridge. The memory has the same alignment
as
- in the 'Generic' allocator but is also explicitly marked as an SHM
Bridge
- buffer.
+ Use Qualcomm Shared Memory Bridge as memory allocator. The memory has
the
+ same alignment as in the 'Generic' allocator, which is used when this
option
+ is disabled, but is also explicitly marked as an SHM Bridge buffer.
With this selected, all buffers passed to the TrustZone must be
allocated
using the TZMem allocator or else the TrustZone will refuse to use
them.
-endchoice
-
config QCOM_QSEECOM
bool "Qualcomm QSEECOM interface driver"
depends on QCOM_SCM=y
signature.asc
Description: PGP signature
