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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpiqGOBNTkZk.pgp
Description: PGP signature
