projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3647d34 dd82088)
Merge branch 'master' of git://1984.lsi.us.es/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Feb 2013 22:24:26 +0000 (17:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Feb 2013 22:24:26 +0000 (17:24 -0500)
Pablo Neira Ayuso says:

====================
The following patchset contains two bugfixes for netfilter/ipset via
Jozsef Kadlecsik, they are:

* Fix timeout corruption if sets are resized, by Josh Hunt.

* Fix bogus error report if the flag nomatch is set, from Jozsef.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
net/netfilter/ipset/ip_set_core.c patch | diff1 | diff2 | blob | history

diff --cc net/netfilter/ipset/ip_set_core.c
Simple merge