From: David S. Miller <davem@davemloft.net>
Date: Mon, 1 Jun 2015 23:56:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v4.14-rc1~5316^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e453581dd518f60b45a8d2b9cf344e2a87d5267e;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

e453581dd518f60b45a8d2b9cf344e2a87d5267e