Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1345475 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-02-29 05:30 +0100 |
| Last post | 2016-02-29 09:00 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the iommu tree with the samsung-krzk tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-29 05:30 +0100
Re: linux-next: manual merge of the iommu tree with the samsung-krzk tree Joerg Roedel <joro@8bytes.org> - 2016-02-29 09:00 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-02-29 05:30 +0100 |
| Subject | linux-next: manual merge of the iommu tree with the samsung-krzk tree |
| Message-ID | <r7nD6-5hw-37@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Joerg Roedel <joro@8bytes.org> |
|---|---|
| Date | 2016-02-29 09:00 +0100 |
| Message-ID | <r7qUi-69-15@gated-at.bofh.it> |
| In reply to | #1345475 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web