Messages in this thread | | | Date | Tue, 27 Apr 2010 17:05:43 -0700 (PDT) | Subject | Re: linux-next: manual merge of the net tree with Linus' tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 27 Apr 2010 11:28:27 +1000
> Hi all, > > Today's linux-next merge of the net tree got a conflict in > drivers/net/e100.c between commit > 401da6aea31ef69c2fcd260382adabdcf7ce820a ("e100: Fix the TX workqueue > race") from Linus' tree and commit > fa05e1ad1b61b37fb64a66794c11ab478e975c56 ("drivers/net/e100.c: Use > pr_<level> and netif_<level>") from the net tree. > > Just context changes. I fixed it up (see below) and can carry the fix > for a while.
This should be resolved now that I pulled net-2.6 into net-next-2.6 earlier today.
| |