Merge git://git.kernel.org/pub/scm/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 <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index aff6d37f2676484e4f4ee3cfce06fd51e404fc3d,fdd078d7d82c661ec5c63e8198c9ae6d464366c3..50b1b34bde6d7727e4d666605ac0b49ed441bf7e
--- 1/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
--- 2/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

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/ops.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/usb/gadget/function/f_phonet.c
Simple merge

diff --cc lib/rhashtable.c
Simple merge

diff --cc net/ipv4/fou.c
Simple merge

diff --cc net/ipv4/ip_sockglue.c
Simple merge

diff --cc net/irda/af_irda.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge