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: (c92b9655 ipv4: Add FLOWI_FLAG_KNOWN_NH) which was required for the xt_TEE fix. ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
Please register or sign in to comment