Messages in this thread | | | Date | Mon, 05 Mar 2012 21:17:23 -0500 (EST) | Subject | Re: linux-next: manual merge of the net-next tree with the net tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 5 Mar 2012 13:11:03 +1100
> Today's linux-next merge of the net-next tree got a conflict in > drivers/net/vmxnet3/vmxnet3_drv.c between commit efead8710aad ("vmxnet3: > Fix transport header size") from the net tree and commit 8bca5d1ebb8b > ("vmxnet3: cleanup tso headers manipulation") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary.
I'm taking care of this right now, thanks Stephen.
| |