Re: [GIT PULL] slave-dmaengine updates for 3.4

[Linus Torvalds]

On Thu, Mar 29, 2012 at 4:26 AM, Vinod Koul <vinod.koul@xxxxxxxxxxxxxxx> wrote:
>
> There are few merge conflicts with your tree, so I created a branch on
> todays tip and merged the slave-dma.next. Results are at
> git://git.infradead.org/users/vkoul/slave-dma.git linus_master_merge
> for you to compare while merging.

Hmm. I think your merge is wrong.

You left the "select ARCH_MXC_AUDMUX_V1" in arch/arm/mach-imx/Kconfig
around, even though that was removed elsewhere.

You also lost the changes to the pl330.c driver (DINVALID1 and the fix
for the NULL pointer dereference on thrd), and you've left a duplicate
dev_notice() in atmel-mci.c..

Anyway, I *think* I got my merge right, but people should double-check
and actually test the affected drivers.

I also get the feeling that snd_hwparams_to_dma_slave_config() should
clear the device_fc field, but whatever. I had resolved that
identically to yours as a "minimal change".

                            Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/