Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
arch/arm64/Kconfig.platforms
between commit:
67060ed148cc ("arm64: remove redundant "select HAVE_CLK"")
from the arm64 tree and commit:
da9a1c676754 ("arm64: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the gpio 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/Kconfig.platforms
index 4e0e1071f2e8,4fb0bef0f094..000000000000
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -163,9 -158,9 +162,10 @@@ config ARCH_TEGR
select CLKSRC_MMIO
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
+ select GPIOLIB
- select HAVE_CLK
select PINCTRL
+ select PM
+ select PM_GENERIC_DOMAINS
select RESET_CONTROLLER
help
This enables support for the NVIDIA Tegra SoC family.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
