Messages in this thread | | | Date | Thu, 13 Nov 2014 16:14:05 -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: Thu, 13 Nov 2014 11:35:55 +1100
> Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/chelsio/cxgb4vf/sge.c between commit 65f6ecc93e7c > ("cxgb4vf: Move fl_starv_thres into adapter->sge data structure") from > the net tree and commit aa9cd31c3f3e ("cxgb4/cxgb4vf: Replace > __skb_alloc_page with __dev_alloc_page") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
This merge resolution looks perfect.
| |