Messages in this thread | | | Date | Sun, 29 Nov 2009 17:11:31 -0800 (PST) | Subject | Re: linux-next: manual merge of the net tree with the net-current tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 24 Nov 2009 14:11:22 +1100
> Today's linux-next merge of the net tree got a conflict in > drivers/net/e1000e/ich8lan.c between commit > 818f33313caab9be2a10458500dbed4a88c1b334 ("e1000e: do not initiate > autonegotiation during OEM configuration") from the net-current tree and > commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops > function pointers") from the net tree. > > Just context changes. I fixed it up (see below) and can carry the fix for > a while.
I took care of this merge when I pulled net-2.6 into net-next-2.6 last night.
Just FYI...
| |