From: David S. Miller <davem@davemloft.net>
Date: Sun, 15 May 2016 17:32:12 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.7-rc1~154^2~52
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=909b27f706433a0b3dff79aa259de63aafe40a42;p=cascardo%2Flinux.git

Merge git://git./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>
---

909b27f706433a0b3dff79aa259de63aafe40a42
diff --cc net/ipv4/ip_gre.c
index aaeb478b54cd,4cc84212cce1..4d2025f7ec57
--- a/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) {
 +		if (__iptunnel_pull_header(skb, hdr_len, tpi->proto,
 +					   raw_proto, false) < 0)
 +			goto drop;
 +
- 		skb_pop_mac_header(skb);
+ 		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/netfilter/nf_conntrack_core.c
index 566c64e3ec50,e27fd17c6743..db2312eeb2a4
--- a/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)