Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Conflicts:
	net/netfilter/xt_TEE.c

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for your net tree,
they are:

1) Fix crash when TEE target is used with no --oif, from Eric Dumazet.

2) Oneliner to fix a crash on the redirect traffic to localhost
   infrastructure when interface has not yet an address, from
   Munehisa Kamata.

3) Oneliner not to request module all the time from nfnetlink due to
   wrong type value, from Florian Westphal.

I'll make sure these patches 1 and 2 hit -stable.
====================

The conflict in net/netfilter/xt_TEE.c was minor, a change
to the 'oif' selection overlapping a function signature
change for the nf_dup_ipv{4,6}() routines.

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

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

diff --cc net/netfilter/xt_TEE.c
index 899b061,c5fdea1..3eff7b6
--- 1/net/netfilter/xt_TEE.c
--- 2/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@@ -31,8 -31,9 +31,9 @@@ static unsigned in
  tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
  {
        const struct xt_tee_tginfo *info = par->targinfo;
+       int oif = info->priv ? info->priv->oif : 0;
  
-       nf_dup_ipv4(par->net, skb, par->hooknum, &info->gw.in, info->priv->oif);
 -      nf_dup_ipv4(skb, par->hooknum, &info->gw.in, oif);
++      nf_dup_ipv4(par->net, skb, par->hooknum, &info->gw.in, oif);
  
        return XT_CONTINUE;
  }
@@@ -42,8 -43,9 +43,9 @@@ static unsigned in
  tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
  {
        const struct xt_tee_tginfo *info = par->targinfo;
+       int oif = info->priv ? info->priv->oif : 0;
  
-       nf_dup_ipv6(par->net, skb, par->hooknum, &info->gw.in6, info->priv->oif);
 -      nf_dup_ipv6(skb, par->hooknum, &info->gw.in6, oif);
++      nf_dup_ipv6(par->net, skb, par->hooknum, &info->gw.in6, oif);
  
        return XT_CONTINUE;
  }