summaryrefslogtreecommitdiffstats
path: root/net/netfilter/nfnetlink_queue.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso2015-10-05 17:25:54 +0200
committerPablo Neira Ayuso2015-10-05 17:27:06 +0200
commit2b5b1a01a77f0e24b77680fce5245a582cb96330 (patch)
tree2abf19a04f75ed31a8b0fc54b0d6a8ed22385ee9 /net/netfilter/nfnetlink_queue.c
parentnetfilter: rename nfnetlink_queue_core.c to nfnetlink_queue.c (diff)
parentipvs: Don't protect ip_vs_addr_is_unicast with CONFIG_SYSCTL (diff)
downloadkernel-qcow2-linux-2b5b1a01a77f0e24b77680fce5245a582cb96330.tar.gz
kernel-qcow2-linux-2b5b1a01a77f0e24b77680fce5245a582cb96330.tar.xz
kernel-qcow2-linux-2b5b1a01a77f0e24b77680fce5245a582cb96330.zip
Merge tag 'ipvs3-for-v4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
Simon Horman says: ==================== Third Round of IPVS Updates for v4.4 please consider this build fix from Eric Biederman which resolves a build problem introduced in is excellent work to cleanup IPVS which you recently pulled: its queued up for v4.4 so no need to worry about earlier kernel versions. I have another minor cleanup, to fix a build warning, pending. However, I wanted to send this one to you now as its hit nf-next, net-next and in turn next, and a slow trickle of bug reports are appearing. ==================== Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nfnetlink_queue.c')
0 files changed, 0 insertions, 0 deletions