From: David S. Miller <davem@davemloft.net>
Date: Fri, 10 Oct 2014 19:01:09 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Tag: v4.9.8~5486^2~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b6fa1eef68591b0ba27f16c149180ce1cf7047f;p=platform%2Fkernel%2Flinux-rpi3.git

Merge git://git./linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

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

This batch contains two fixes for what you have in your net-next,
they are:

1) Remove nf_send_reset6() from header file. This function now resides
   in the nf_reject_ipv6 module. Reported by Eric Dumazet.

2) Fix wrong NFT_REJECT_ICMPX_MAX definition and adjust code to fix
   errors reported by Dan Carpenter's static analysis tools.
====================

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

7b6fa1eef68591b0ba27f16c149180ce1cf7047f