From: David S. Miller <davem@davemloft.net>
Date: Wed, 8 Oct 2008 21:26:36 +0000 (-0700)
Subject: Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~29916^2~88
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=db2bf2476b2d99d91b4ce87e102dd3a61e92366f;p=mirror_ubuntu-artful-kernel.git

Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6

Conflicts:

	net/netfilter/Kconfig
---

db2bf2476b2d99d91b4ce87e102dd3a61e92366f
diff --cc net/netfilter/Kconfig
index f70b4145ffc7,73f9378e1bfe..78892cf2b021
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@@ -855,6 -821,22 +855,8 @@@ config NETFILTER_XT_MATCH_U3
  
  	  Details and examples are in the kernel module source.
  
 -config NETFILTER_XT_MATCH_HASHLIMIT
 -	tristate '"hashlimit" match support'
 -	depends on NETFILTER_XTABLES && (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
 -	depends on NETFILTER_ADVANCED
 -	help
 -	  This option adds a `hashlimit' match.
 -
 -	  As opposed to `limit', this match dynamically creates a hash table
 -	  of limit buckets, based on your selection of source/destination
 -	  addresses and/or ports.
 -
 -	  It enables you to express policies like `10kpps for any given
 -	  destination address' or `500pps from any given source address'
 -	  with a single rule.
 +endif # NETFILTER_XTABLES
  
  endmenu
+ 
+ source "net/netfilter/ipvs/Kconfig"
 -