* linux-next: manual merge of the char-misc tree with the slave-dma tree
@ 2014-07-29 7:38 Stephen Rothwell
2014-07-29 15:36 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2014-07-29 7:38 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Vinod Koul
Cc: linux-next, linux-kernel, Maxime Ripard, Siva Yerramreddy
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the char-misc tree with the slave-dma tree
2014-07-29 7:38 linux-next: manual merge of the char-misc tree with the slave-dma tree Stephen Rothwell
@ 2014-07-29 15:36 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2014-07-29 15:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Vinod Koul, linux-next, linux-kernel,
Maxime Ripard, Siva Yerramreddy
On Tue, Jul 29, 2014 at 05:38:24PM +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 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).
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the char-misc tree with the slave-dma tree
2014-08-05 6:28 Stephen Rothwell
2014-08-05 15:29 ` Greg KH
@ 2014-08-05 16:16 ` Vinod Koul
1 sibling, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2014-08-05 16:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Arnd Bergmann, linux-next, linux-kernel,
Siva Yerramreddy, Guennadi Liakhovetski
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the char-misc tree with the slave-dma tree
2014-08-05 6:28 Stephen Rothwell
@ 2014-08-05 15:29 ` Greg KH
2014-08-05 16:16 ` Vinod Koul
1 sibling, 0 replies; 5+ messages in thread
From: Greg KH @ 2014-08-05 15:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Vinod Koul, linux-next, linux-kernel,
Siva Yerramreddy, Guennadi Liakhovetski
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).
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the char-misc tree with the slave-dma tree
@ 2014-08-05 6:28 Stephen Rothwell
2014-08-05 15:29 ` Greg KH
2014-08-05 16:16 ` Vinod Koul
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2014-08-05 6:28 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Vinod Koul
Cc: linux-next, linux-kernel, Siva Yerramreddy, Guennadi Liakhovetski
[-- Attachment #1: Type: text/plain, Size: 906 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-08-05 16:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-29 7:38 linux-next: manual merge of the char-misc tree with the slave-dma tree Stephen Rothwell
2014-07-29 15:36 ` Greg KH
2014-08-05 6:28 Stephen Rothwell
2014-08-05 15:29 ` Greg KH
2014-08-05 16:16 ` Vinod Koul
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).