Messages in this thread | | | Date | Mon, 26 Nov 2012 23:48:44 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |