]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9db2971 8b78ff4)
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)
commit4811502c6aa1f07f859477c9779f8cc0c7d961dc
tree611d2648429eff830a6c4047e12e108fef3173f4tree | snapshot
parent9db2971e6c3f6ab5974fad1b129b97e0d15dfaa4commit | diff
parent8b78ff4973951a213e2f37e7964ec67a2c86f930commit | diff
Merge branch 'master' of git://1984.lsi.us.es/nf

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>
net/netfilter/ipset/ip_set_core.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.