From: David S. Miller Date: Fri, 14 Nov 2014 06:01:12 +0000 (-0500) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=076ce4482569ea1a2c27b4ca71a309adaf91d398;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller --- 076ce4482569ea1a2c27b4ca71a309adaf91d398 diff --cc drivers/net/ethernet/chelsio/cxgb4vf/sge.c index aff6d37f2676,fdd078d7d82c..50b1b34bde6d --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c @@@ -614,7 -608,8 +610,7 @@@ static unsigned int refill_fl(struct ad goto alloc_small_pages; while (n) { - page = __dev_alloc_pages(gfp, FL_PG_ORDER); - page = alloc_pages(gfp | __GFP_COMP | __GFP_NOWARN, - s->fl_pg_order); ++ page = __dev_alloc_pages(gfp, s->fl_pg_order); if (unlikely(!page)) { /* * We've failed inour attempt to allocate a "large