From: David S. Miller <davem@davemloft.net>
Date: Thu, 6 Oct 2016 00:15:55 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Tag: Ubuntu-4.10.0-19.21~2482^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5bfb88a1636eadd55971ad23890356831a93325d;p=mirror_ubuntu-artful-kernel.git

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

Pablo Neira Ayuso says:

====================
Netfilter fixes for net-next

This is a pull request to address fallout from previous nf-next pull
request, only fixes going on here:

1) Address a potential null dereference in nf_unregister_net_hook()
   when becomes nf_hook_entry_head is NULL, from Aaron Conole.

2) Missing ifdef for CONFIG_NETFILTER_INGRESS, also from Aaron.

3) Fix linking problems in xt_hashlimit in x86_32, from Pai.

4) Fix permissions of nf_log sysctl from unpriviledge netns, from
   Jann Horn.

5) Fix possible divide by zero in nft_limit, from Liping Zhang.
====================

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

5bfb88a1636eadd55971ad23890356831a93325d