* linux-next: manual merge of the iommu tree with the samsung-krzk tree
@ 2016-02-29 4:20 Stephen Rothwell
2016-02-29 7:56 ` Joerg Roedel
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2016-02-29 4:20 UTC (permalink / raw)
To: Joerg Roedel, Krzysztof Kozlowski
Cc: linux-next, linux-kernel, Pankaj Dubey, Yong Wu, Matthias Brugger
Hi Joerg,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/memory/Kconfig
between commit:
78fbb9361ca3 ("memory: Add support for Exynos SROM driver")
from the samsung-krzk tree and commit:
cc8bbe1a8312 ("memory: mediatek: Add SMI driver")
from the iommu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/memory/Kconfig
index bcb19822968b,51d5cd20c26a..000000000000
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@@ -114,7 -114,14 +114,15 @@@ config JZ4780_NEM
the Ingenic JZ4780. This controller is used to handle external
memory devices such as NAND and SRAM.
+ config MTK_SMI
+ bool
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ help
+ This driver is for the Memory Controller module in MediaTek SoCs,
+ mainly help enable/disable iommu and control the power domain and
+ clocks for each local arbiter.
+
+source "drivers/memory/samsung/Kconfig"
source "drivers/memory/tegra/Kconfig"
endif
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the iommu tree with the samsung-krzk tree
2016-02-29 4:20 linux-next: manual merge of the iommu tree with the samsung-krzk tree Stephen Rothwell
@ 2016-02-29 7:56 ` Joerg Roedel
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Roedel @ 2016-02-29 7:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Krzysztof Kozlowski, linux-next, linux-kernel, Pankaj Dubey,
Yong Wu, Matthias Brugger
Hi Stephen,
On Mon, Feb 29, 2016 at 03:20:55PM +1100, Stephen Rothwell wrote:
> Hi Joerg,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/memory/Kconfig
>
> between commit:
>
> 78fbb9361ca3 ("memory: Add support for Exynos SROM driver")
>
> from the samsung-krzk tree and commit:
>
> cc8bbe1a8312 ("memory: mediatek: Add SMI driver")
>
> from the iommu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks for fixing this (and the other conflict before) up.
Joerg
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-29 7:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-29 4:20 linux-next: manual merge of the iommu tree with the samsung-krzk tree Stephen Rothwell
2016-02-29 7:56 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).