]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9e85c071b7f8c79af6ea9917b8b038ef8e6e85f3
tree0d1cc178164471008f792827cdbc829d84c5bd17
parent6240b6ec9c680935cbad5bbc02f0d0e51d9798a9
parenta041f3954c5534ee2b0b9a728439713cbc516ca8
Merge git://git.kernel.org/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 a041f3954c55 ('Revert "netfilter: ensure
number of counters is >0 in do_replace()"') since this breaks ebtables.
====================

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