Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge

diff --cc drivers/net/ethernet/sfc/ef10.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/davinci_emac.c
Simple merge

diff --cc drivers/net/ethernet/xscale/ixp4xx_eth.c
Simple merge

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

diff --cc drivers/net/phy/marvell.c
Simple merge

diff --cc net/core/dev.c
index eed028a,15fe363..222b1d3
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -5964,9 -5910,11 +5964,9 @@@ static void gro_list_prepare(const stru
                                       maclen);
                NAPI_GRO_CB(p)->same_flow = !diffs;
        }
 -
 -      return head;
  }
  
- static void skb_gro_reset_offset(struct sk_buff *skb)
+ static inline void skb_gro_reset_offset(struct sk_buff *skb, u32 nhoff)
  {
        const struct skb_shared_info *pinfo = skb_shinfo(skb);
        const skb_frag_t *frag0 = &pinfo->frags[0];

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/sched/sch_taprio.c
Simple merge