]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b6f903 d477881)
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)
commitd3c0009b35e426f64229c5062341ee814455fc33
tree0d1cc178164471008f792827cdbc829d84c5bd17tree | snapshot
parent5b6f9035670f314478b9f2138291af5dfed8ffa4commit | diff
parentd4778816a23ff6f98a84bc705bf627e42a434b13commit | 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 d4778816a23f ('Revert "netfilter: ensure
number of counters is >0 in do_replace()"') since this breaks ebtables.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.