On Mon, Dec 09, 2013 at 04:50:22PM -0700, Stephen Warren wrote:
On 12/09/2013 01:44 PM, Lars-Peter Clausen wrote:
This will have a conflict with the "ASoC: ep93xx: Use devm_snd_dmaengine_pcm_register()" patch from the topic/ep93xx branch.
That's true. The conflict isn't conceptually that hard to resolve, but probably a lot more than you want to do in a merge. I guess the way to resolve it is to merge topic/ep93xx and topic/spear into topic/dma, then to apply these patches on top. If that sounds good, I can rebase them and resend.
Please always submit against -next or at least check that that's going to work and comment on the result, it makes life easier. Remember that all the topic branches are constantly merged together, it's important that that works smoothly.