diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-12 14:26:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-12 14:26:39 -0400 |
| commit | 8b5b8c29909b94a4f2969629722264b7ca947329 (patch) | |
| tree | b29c2de6d0903f6dc4d31dddd6491aa0c2c518dc /kernel/lockdep.c | |
| parent | 50bceae9bd3569d56744882f3012734d48a1d413 (diff) | |
| parent | c2d421e171868586939c328dfb91bab840fe4c49 (diff) | |
| download | op-kernel-dev-8b5b8c29909b94a4f2969629722264b7ca947329.zip op-kernel-dev-8b5b8c29909b94a4f2969629722264b7ca947329.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf into netfilter
Pablo Neira Ayuso says:
====================
The following patchset contains late netfilter fixes for your net
tree, they are:
* Don't drop segmented TCP packets in the SIP helper, we've got reports
from users that this was breaking communications when the SIP phone
messages are larger than the MTU, from Patrick McHardy.
* Fix refcount leak in the ipset list set, from Jozsef Kadlecsik.
* On hash set resizing, the nomatch flag was lost, thus entirely inverting
the logic of the set matching, from Jozsef Kadlecsik.
* Fix crash on NAT modules removal. Timer expiration may race with the
module cleanup exit path while deleting conntracks, from Florian
Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/lockdep.c')
0 files changed, 0 insertions, 0 deletions
