RE: linux-next: manual merge of the arm-soc tree with the spi-mb tree

2013-04-26 Thread Yang, Wenyou
g; linux-kernel@vger.kernel.org; Yang, Wenyou; > Richard Genoud; Mark Brown; Ferre, Nicolas > Subject: linux-next: manual merge of the arm-soc tree with the spi-mb tree > > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/at91sam9x

Re: linux-next: manual merge of the arm-soc tree with the spi-mb tree

2013-04-26 Thread Richard Genoud
2013/4/26 Stephen Rothwell : > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/at91sam9x5.dtsi between commits d50f88a0c304 ("ARM: > dts: add spi nodes for atmel SoC") and a68b728f7a21 ("ARM: dts: add > pinctrl property for spi node for atmel SoC") fro

linux-next: manual merge of the arm-soc tree with the spi-mb tree

2013-04-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/boot/dts/at91sam9x5.dtsi between commits d50f88a0c304 ("ARM: dts: add spi nodes for atmel SoC") and a68b728f7a21 ("ARM: dts: add pinctrl property for spi node for atmel SoC") from the spi-mb tree and commits e9a72ee81d

linux-next: manual merge of the arm-soc tree with the spi-mb tree

2012-10-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/spi/spi-tegra.c between commit 536a53a300d0 ("spi: remove completely broken Tegra driver") from the spi-mb tree and commit 5bd276118189 ("spi: tegra: remove support of legacy DMA driver based access") from the arm-soc t

linux-next: manual merge of the arm-soc tree with the spi-mb tree

2012-10-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/spi/Kconfig between commit 536a53a300d0 ("spi: remove completely broken Tegra driver") from the spi-mb tree and commit 5bd276118189 ("spi: tegra: remove support of legacy DMA driver based access") from the arm-soc tree.