Subject: Re: [patch 5/7] netxen: fix race in interrupt / napi

From: Jeff Garzik <[email-masked]>
Date: Sat, 12 Jan 2008 17:38:03 -0500

patch conflicted with

commit 1706287f6eb58726a9a0e5cbbde87f49757615e3
Author: David S. Miller <[email-masked]>
Date:   Mon Jan 7 20:51:29 2008 -0800

     [NETXEN]: Fix ->poll() done logic.

     If work_done >= budget we should always elide the NAPI
     completion.

     Signed-off-by: David S. Miller <[email-masked]>