From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Vinod Koul <vinod.koul@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Maxime Ripard <maxime.ripard@free-electrons•com>,
Siva Yerramreddy <yshivakrishna@gmail•com>
Subject: linux-next: manual merge of the char-misc tree with the slave-dma tree
Date: Tue, 29 Jul 2014 17:38:24 +1000 [thread overview]
Message-ID: <20140729173824.51e94ce2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 874 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in
drivers/dma/Makefile between commit 555859308723 ("dmaengine: sun6i:
Add driver for the Allwinner A31 DMA controller") from the slave-dma tree and
commit 95b4ecbf759a ("dma: MIC X100 DMA Driver") from the char-misc
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/dma/Makefile
index d08bd966da13,bd9e7fa928bd..000000000000
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -47,4 -47,4 +47,5 @@@ obj-$(CONFIG_MOXART_DMA) += moxart-dma.
obj-$(CONFIG_FSL_EDMA) += fsl-edma.o
obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o
obj-y += xilinx/
+obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
+ obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-29 7:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 7:38 Stephen Rothwell [this message]
2014-07-29 15:36 ` linux-next: manual merge of the char-misc tree with the slave-dma tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2014-08-05 6:28 Stephen Rothwell
2014-08-05 15:29 ` Greg KH
2014-08-05 16:16 ` Vinod Koul
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=20140729173824.51e94ce2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
--cc=vinod.koul@intel$(echo .)com \
--cc=yshivakrishna@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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