Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/net/ethernet/jme.c between commit 71c6c837a0fe ("drivers/net: fix
tasklet misuse issue") from Linus' tree and commit "tasklet: ignore
disabled tasklet in tasklet_action()" from the akpm tree.
I am not sure what to do here, so I have dropped the akpm patch.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpNlbVLxc20p.pgp
Description: PGP signature
