From: David S. Miller <davem@davemloft.net>
Date: Thu, 18 Oct 2012 19:17:09 +0000 (-0400)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf
X-Git-Tag: v3.7-rc3~7^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6dae82224855be851e875d7573581c90b1932ab9;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'master' of git://1984.lsi.us.es/nf

Pablo Neira Ayuso Says:

====================
The following patchset contains Netfilter/IPVS updates for your
net tree, they are:

* Fix incorrect hooks for SNAT and DNAT (bug introduced in recent IPv6
  NAT changes), from Elison Niven.

* Fix xt_TEE (got broken with recent rt_gateway semantic change),
  from Eric Dumazet.

* Fix custom conntrack timeout policy attachment for IPv6, from myself.

* Always initialize ip_vs_timeout_user in case that TCP or UDP protocols
  is disabled, from Arnd Bergmann.

Note that I had to pull from your tree to obtain:

(c92b96553a80c1 ipv4: Add FLOWI_FLAG_KNOWN_NH)

which was required for the xt_TEE fix.
====================

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

6dae82224855be851e875d7573581c90b1932ab9