linux-next: manual merge of the arm-soc tree with the slave-dma tree

2013-01-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got conflicts in arch/arm/mach-spear3xx/spear3xx.c and arch/arm/mach-spear6xx/spear6xx.c between commit 3a95b9fbba89 ("pl080.h: moved from arm/include/asm/hardware to include/linux/amba/") from the slave-dma tree and commit e9c515589df7 ("ARM: s

linux-next: manual merge of the arm-soc tree with the slave-dma tree

2013-01-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-spear13xx/spear1340.c between commit f9965aa20706 ("ARM: SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and commit 0529e315bbda ("ARM: use common irqchip_init for GIC init") from the arm-s

Re: linux-next: manual merge of the arm-soc tree with the slave-dma tree

2012-11-27 Thread Stephen Rothwell
Hi, On Tue, 27 Nov 2012 11:08:36 +0530 Viresh Kumar wrote: > > On 27 November 2012 10:14, Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM: > > SPEAr13xx: Pass DW DMAC platform dat

Re: linux-next: manual merge of the arm-soc tree with the slave-dma tree

2012-11-26 Thread Viresh Kumar
On 27 November 2012 10:14, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM: > SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree > and commit 300a6856324a ("ARM: SP

linux-next: manual merge of the arm-soc tree with the slave-dma tree

2012-11-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM: SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and commit 300a6856324a ("ARM: SPEAr1310: Fix AUXDATA for compact flash controller")

linux-next: manual merge of the arm-soc tree with the slave-dma tree

2012-11-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/boot/dts/spear1340.dtsi between commit b47394911c26 ("ARM: SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree and commit 8113ba917dfa ("ARM: SPEAr: DT: Update device nodes") from the arm-soc tree.

linux-next: manual merge of the arm-soc tree with the slave-dma tree

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/spi/spi-davinci.c between commit 048177ce3b39 ("spi: spi-davinci: convert to DMA engine API") from the slave-dma tree and commit ec2a0833e515 ("ARM: davinci: move platform_data definitions") from the arm-soc tree. I fi

linux-next: manual merge of the arm-soc tree with the slave-dma tree

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/mmc/host/davinci_mmc.c between commit b5daabbd3d18 ("mmc: davinci_mmc: convert to DMA engine API") from the slave-dma tree and commit ec2a0833e515 ("ARM: davinci: move platform_data definitions") from the arm-soc tree.

linux-next: manual merge of the arm-soc tree with the slave-dma tree

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/dma/mmp_tdma.c between commit f1a7757008b8 ("dmaengine: mmp_tdma: add dt support") from the slave-dma tree and commit 293b2da1b611 ("ARM: pxa: move platform_data definitions") from the arm-soc tree. I fixed it up (see