projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd842a6 d26e2c9)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2015 23:56:43 +0000 (16:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2015 23:56:43 +0000 (16:56 -0700)
commite453581dd518f60b45a8d2b9cf344e2a87d5267e
tree0d1cc178164471008f792827cdbc829d84c5bd17tree | snapshot (tar.gz zip)
parentcd842a67e660dd3a2605557b9a64ea01cb57ba72commit | diff
parentd26e2c9ffa385dd1b646f43c1397ba12af9ed431commit | diff
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fix for net

The following patch reverts the ebtables chunk that enforces counters that was
introduced in the recently applied d26e2c9ffa38 ('Revert "netfilter: ensure
number of counters is >0 in do_replace()"') since this breaks ebtables.
====================

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