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

Xiaotian Feng
2012-11-26T13:25:18Z

On Mon, Nov 26, 2012 at 8:48 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
>

You can simply remove the following part of the patch

@@ -1862,8 +1862,8 @@ jme_open(struct net_device *netdev)

tasklet_enable(&jme->linkch_task);
tasklet_enable(&jme->txclean_task);
- tasklet_hi_enable(&jme->rxclean_task);
- tasklet_hi_enable(&jme->rxempty_task);
+ tasklet_enable(&jme->rxclean_task);
+ tasklet_enable(&jme->rxempty_task);

rc = jme_request_irq(jme);
if (rc)

Do you want me to re-generate a patch for you?

> I am not sure what to do here, so I have dropped the akpm patch.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au