| commit | e453581dd518f60b45a8d2b9cf344e2a87d5267e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jun 01 16:56:43 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jun 01 16:56:43 2015 -0700 |
| tree | 0d1cc178164471008f792827cdbc829d84c5bd17 | |
| parent | cd842a67e660dd3a2605557b9a64ea01cb57ba72 [diff] | |
| parent | d26e2c9ffa385dd1b646f43c1397ba12af9ed431 [diff] |
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 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>