From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joerg Roedel <joro@8bytes.org>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Pankaj Dubey <pankaj.dubey@samsung.com>,
Yong Wu <yong.wu@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>
Subject: linux-next: manual merge of the iommu tree with the samsung-krzk tree
Date: Mon, 29 Feb 2016 15:20:55 +1100 [thread overview]
Message-ID: <20160229152055.3af83d1a@canb.auug.org.au> (raw)
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
next reply other threads:[~2016-02-29 4:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 4:20 Stephen Rothwell [this message]
2016-02-29 7:56 ` linux-next: manual merge of the iommu tree with the samsung-krzk tree Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160229152055.3af83d1a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=joro@8bytes.org \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=pankaj.dubey@samsung.com \
--cc=yong.wu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).