On Thu, 2012-09-27 at 17:00 +0300, Andy Shevchenko wrote: > On Thu, Sep 27, 2012 at 1:06 PM, Vinod Koul <vinod.k...@linux.intel.com> > wrote: > > On Tue, 2012-09-25 at 14:39 +0300, Andy Shevchenko wrote: > >> Not all of the controllers support the 64 bit data width. Make it > >> configurable > >> via platform data. The driver will try to get a value from the component > >> parameters, otherwise it will use the platform data. > >> > > What was this gen against, I can apply this. > Just rebased to recent linux-next, no conflicts. And I dont apply patches against linux-next!! I apply against slave-dma-next. > ... > Applying: dw_dmac: mark dwc_dump_chan_regs as inline > Applying: dw_dmac: fill optional encoded parameters in register structure > Applying: dw_dmac: get number of channels from hardware if possible > Applying: dw_dmac: autoconfigure block_size or use platform data > Applying: dw_dmac: autoconfigure data_width or get it via platform data > Applying: dw_dmac: introduce software emulation of LLP transfers > ... > > Have you kept the order of the patches? Obviously see my next
The reason for conflict is nature of this patch. It should be split up. arch/arm/mach-spear13xx/spear13xx.c | 2 ++ arch/avr32/mach-at32ap/at32ap700x.c | 2 ++ It fails here, send these separately to Arnd. -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
