From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vinod.koul@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Javier Martin <javier.martin@vista-silicon.com>,
Shawn Guo <shawn.guo@linaro.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: linux-next: manual merge of the slave-dma tree with Linus' tree
Date: Tue, 27 Mar 2012 11:45:45 +1100 [thread overview]
Message-ID: <20120327114545.031deecd5fb48267b56b9b2c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-imx/Kconfig between commit 3c77c29c49c6 ("ASoC: imx: move
audmux driver into sound/soc/imx") from Linus' tree and commit
6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c")
from the slave-dma tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-imx/Kconfig
index 3919fba,3da1421..0000000
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -46,7 -30,7 +42,6 @@@ config SOC_IMX2
bool
select MACH_MX21
select CPU_ARM926T
- select IMX_HAVE_DMA_V1
- select ARCH_MXC_AUDMUX_V1
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
@@@ -61,7 -46,7 +56,6 @@@ config SOC_IMX2
bool
select MACH_MX27
select CPU_ARM926T
- select IMX_HAVE_DMA_V1
- select ARCH_MXC_AUDMUX_V1
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-27 0:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-27 0:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-12 5:26 linux-next: manual merge of the slave-dma tree with Linus' tree Stephen Rothwell
2020-03-12 7:16 ` Peter Ujfalusi
2020-03-13 12:42 ` Vinod Koul
2019-06-11 6:32 Stephen Rothwell
2019-06-11 10:08 ` Vinod Koul
2019-02-26 4:24 Stephen Rothwell
2019-02-26 17:22 ` Vinod Koul
2019-01-23 2:41 Stephen Rothwell
2012-12-18 23:44 Stephen Rothwell
2012-03-09 2:25 Stephen Rothwell
2011-08-26 1:46 Stephen Rothwell
2011-07-27 2:08 Stephen Rothwell
2011-07-27 3:12 ` Koul, Vinod
2011-07-27 16:25 ` Koul, Vinod
2011-07-27 20:19 ` Russell King - ARM Linux
2011-07-27 20:29 ` Grant Likely
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=20120327114545.031deecd5fb48267b56b9b2c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=javier.martin@vista-silicon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shawn.guo@linaro.org \
--cc=vinod.koul@intel.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).