Re: linux-next: manual merge of the akpm tree with the block tree

[Asai Thambi S P]

On 1/14/2013 9:28 AM, Stephen Rothwell wrote:

> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/block/mtip32xx/mtip32xx.c between commit 16c906e51c6f ("mtip32xx:
> Add workqueue and NUMA support") from the  tree and commit "mtip32xx:
> convert to batch completion" from the akpm tree.
> 
> I couldn't see how to fix up the conflicts, so I just dropped the akpm
> tree patch.
> 

I will fix this and send out the patch.

--
Regards,
Asai
--
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/