From: Vinod Koul <vinod.koul@intel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Siva Yerramreddy <yshivakrishna@gmail•com>,
Guennadi Liakhovetski <g.liakhovetski@gmx•de>
Subject: Re: linux-next: manual merge of the char-misc tree with the slave-dma tree
Date: Tue, 5 Aug 2014 21:46:41 +0530 [thread overview]
Message-ID: <20140805161641.GV8181@intel.com> (raw)
In-Reply-To: <20140805162843.054e1383@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
On Tue, Aug 05, 2014 at 04:28:43PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/dma/Makefile between commit b45b262cefd5 ("dmaengine: add a
> driver for AMBA AXI NBPF DMAC IP cores") 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 f2b831a994cf,bd9e7fa928bd..000000000000
> --- a/drivers/dma/Makefile
> +++ b/drivers/dma/Makefile
> @@@ -47,5 -47,4 +47,6 @@@ 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_NBPFAXI_DMA) += nbpfaxi.o
> +obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
> + obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
Looks fine here
--
~Vinod
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-08-05 16:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-05 6:28 linux-next: manual merge of the char-misc tree with the slave-dma tree Stephen Rothwell
2014-08-05 15:29 ` Greg KH
2014-08-05 16:16 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-29 7:38 Stephen Rothwell
2014-07-29 15:36 ` Greg KH
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=20140805161641.GV8181@intel.com \
--to=vinod.koul@intel$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=g.liakhovetski@gmx$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--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