On Friday 13 December 2013, Sergei Ianovich wrote: > Non-dts implementation supply required DMA channel numbers as > IORESOURCE_DMA. However, there is was no way to get them from > device tree. Please update this changeset comment, I think it still refers to the earlier version. > Signed-off-by: Sergei Ianovich <ynvich@xxxxxxxxx> > CC: Daniel Mack <zonque@xxxxxxxxx> > CC: Arnd Bergmann <arnd@xxxxxxxx> The patch looks ok in case we are merging your patches for 3.14 and Daniel's patches later than that. If they end up in the same merge window however, we'd have to be care to resolve the obvious conflict in a proper way. Arnd -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html