From: David S. Miller <davem@davemloft.net>
Date: Wed, 20 Sep 2017 23:08:23 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v4.14-rc2~10^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c4d11b913ccef0eee8d32e5974ae26617676b77;p=people%2Farne_f%2Fkernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two Netfilter fixes for your net tree,
they are:

1) Fix NAt compilation with UP, from Geert Uytterhoeven.

2) Fix incorrect number of entries when dumping a set, from
   Vishwanath Pai.
====================

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

4c4d11b913ccef0eee8d32e5974ae26617676b77