On Tue, March 10, 2009 4:33 pm, Stephen Rothwell wrote:
> Hi Neil,
>
> Today's linux-next merge of the md tree got a conflict in
> include/linux/dmaengine.h between commit
> 1d93e52eb48df986a3c4d5ad8a520bf1f6837367 ("dmaengine: update kerneldoc")
> from Linus' tree and commit a23742cb3c1ca5d412dea09de452c9d173b80afd
> ("async_tx: add support for asynchronous GF multiplication") from the md
> tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Thanks.
I've resolved this i my tree so you don't need to carry the fix any
further.
I suspect Dan will give an updates set of async-raid6 patches some time
in the next few days....
NeilBrown
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
