From: David S. Miller <davem@davemloft.net>
Date: Thu, 21 Nov 2013 17:44:15 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: accepted/tizen/common/20141203.182822~1043^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd2cc01b675007c3ce235c1f172511c6b2a3ecfa;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'master' of git://git./linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
netfilter fixes for net

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

* Remove extra quote from connlimit configuration in Kconfig, from
  Randy Dunlap.

* Fix missing mss option in syn packets sent to the backend in our
  new synproxy target, from Martin Topholm.

* Use window scale announced by client when sending the forged
  syn to the backend, from Martin Topholm.

* Fix IPv6 address comparison in ebtables, from Luís Fernando
  Cornachioni Estrozi.

* Fix wrong endianess in sequence adjustment which breaks helpers
  in NAT configurations, from Phil Oester.

* Fix the error path handling of nft_compat, from me.

* Make sure the global conntrack counter is decremented after the
  object has been released, also from me.
====================

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

cd2cc01b675007c3ce235c1f172511c6b2a3ecfa