linux-next: manual merge of the genesis tree with the sh tree
in [Kernel]
|
Prev: [GIT PULL] Squashfs updates for 2.6.35
Next: linux-next: manual merge of the galak tree with Linus' tree
From: Stephen Rothwell on 25 May 2010 21:30 Hi Paul, Today's linux-next merge of the genesis tree got a conflict in include/linux/serial_sci.h between commit 14baf9d7f275f0bbf42c1216ff1eef1109ca42ba ("serial: sh-sci: fix up serial DMA build") from the sh tree and commit 927a7c9c1793def3a55d60c926d3945528e6bf1b ("dmaengine: shdma: Enable on SH-Mobile ARM") from the genesis tree. I used the version from the sh tree (i.e. no "#ifdef CONFIG_SERIAL_SH_SCI_DMA" around the include of linux/sh_dma.h). -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Paul Mundt on 25 May 2010 22:00
On Wed, May 26, 2010 at 11:23:31AM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the genesis tree got a conflict in > include/linux/serial_sci.h between commit > 14baf9d7f275f0bbf42c1216ff1eef1109ca42ba ("serial: sh-sci: fix up serial > DMA build") from the sh tree and commit > 927a7c9c1793def3a55d60c926d3945528e6bf1b ("dmaengine: shdma: Enable on > SH-Mobile ARM") from the genesis tree. > Sorry about that, I needed the fix in the sh tree since the genesis tree hadn't been merged yet, so the interdependencies have created a bit of a mess. > I used the version from the sh tree (i.e. no "#ifdef > CONFIG_SERIAL_SH_SCI_DMA" around the include of linux/sh_dma.h). Sounds good, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |