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

The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.h
Simple merge

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

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

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

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

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

diff --cc kernel/events/core.c
Simple merge

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

diff --cc net/ipv4/ip_gre.c
index aaeb478b54cd2657ae8c3d838141a61b9d5eb413,4cc84212cce149e4a089e5f986f1a596596744cc..4d2025f7ec578b7e3f3fd342e82e734d36395068
--- 1/net/ipv4/ip_gre.c
--- 2/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@@ -272,11 -398,10 +272,14 @@@ static int __ipgre_rcv(struct sk_buff *
                                  iph->saddr, iph->daddr, tpi->key);
  
        if (tunnel) {
-               skb_pop_mac_header(skb);
 +              if (__iptunnel_pull_header(skb, hdr_len, tpi->proto,
 +                                         raw_proto, false) < 0)
 +                      goto drop;
 +
+               if (tunnel->dev->type != ARPHRD_NONE)
+                       skb_pop_mac_header(skb);
+               else
+                       skb_reset_mac_header(skb);
                if (tunnel->collect_md) {
                        __be16 flags;
                        __be64 tun_id;

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

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
index 566c64e3ec50be4a1340a45bc2b9ea756197912b,e27fd17c6743b060b1167ab762b61a8e2a728589..db2312eeb2a47c44db0f0ac5a529a10a0a8f8d2f
--- 1/net/netfilter/nf_conntrack_core.c
--- 2/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@@ -69,12 -66,7 +69,13 @@@ EXPORT_SYMBOL_GPL(nf_conntrack_locks)
  __cacheline_aligned_in_smp DEFINE_SPINLOCK(nf_conntrack_expect_lock);
  EXPORT_SYMBOL_GPL(nf_conntrack_expect_lock);
  
 +struct hlist_nulls_head *nf_conntrack_hash __read_mostly;
 +EXPORT_SYMBOL_GPL(nf_conntrack_hash);
 +
 +static __read_mostly struct kmem_cache *nf_conntrack_cachep;
 +static __read_mostly spinlock_t nf_conntrack_locks_all_lock;
 +static __read_mostly seqcount_t nf_conntrack_generation;
+ static __read_mostly DEFINE_SPINLOCK(nf_conntrack_locks_all_lock);
  static __read_mostly bool nf_conntrack_locks_all;
  
  void nf_conntrack_lock(spinlock_t *lock) __acquires(lock)

diff --cc net/netfilter/nfnetlink_acct.c
Simple merge

diff --cc net/openvswitch/conntrack.c
Simple merge

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

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

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

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

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

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