From: Patrick McHardy <kaber@trash.net>
Date: Tue, 20 Apr 2010 14:02:01 +0000 (+0200)
Subject: Merge branch 'master' of /repos/git/net-next-2.6
X-Git-Tag: v5.15~29570^2~168^2~9
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=62910554656cdcd6b6f84a5154c4155aae4ca231;p=mirror_ubuntu-kernels.git

Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

62910554656cdcd6b6f84a5154c4155aae4ca231
diff --cc Documentation/feature-removal-schedule.txt
index ea227e3f528b,116a13c4f13f..a1c6e9277986
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -580,10 -608,23 +598,31 @@@ Why:	Useful in 2003, implementation is 
  	Seen as doing more harm than good.
  Who:	Len Brown <len.brown@intel.com>
  
+ ----------------------------
+ 
+ What:	iwlwifi 50XX module parameters
+ When:	2.6.40
+ Why:	The "..50" modules parameters were used to configure 5000 series and
+ 	up devices; different set of module parameters also available for 4965
+ 	with same functionalities. Consolidate both set into single place
+ 	in drivers/net/wireless/iwlwifi/iwl-agn.c
+ 
+ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
+ 
+ ----------------------------
+ 
+ What:	iwl4965 alias support
+ When:	2.6.40
+ Why:	Internal alias support has been present in module-init-tools for some
+ 	time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
+ 	with no impact.
+ 
+ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
++
 +---------------------------
 +
 +What:	xt_NOTRACK
 +Files:	net/netfilter/xt_NOTRACK.c
 +When:	April 2011
 +Why:	Superseded by xt_CT
 +Who:	Netfilter developer team <netfilter-devel@vger.kernel.org>
diff --cc net/bridge/netfilter/ebt_ulog.c
index f77b42d8e87d,f9560f3dbdc7..852f37c27659
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@@ -27,8 -27,9 +27,9 @@@
   *   flushed even if it is not full yet.
   *
   */
 -
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  #include <linux/module.h>
+ #include <linux/slab.h>
  #include <linux/spinlock.h>
  #include <linux/socket.h>
  #include <linux/skbuff.h>
diff --cc net/ipv4/netfilter/ipt_CLUSTERIP.c
index c6be74e57264,a992dc826f1c..8815d458de46
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@@ -393,11 -393,11 +394,11 @@@ static int clusterip_tg_check(const str
  			config = clusterip_config_init(cipinfo,
  							e->ip.dst.s_addr, dev);
  			if (!config) {
 -				printk(KERN_WARNING "CLUSTERIP: cannot allocate config\n");
 +				pr_info("cannot allocate config\n");
  				dev_put(dev);
 -				return false;
 +				return -ENOMEM;
  			}
- 			dev_mc_add(config->dev,config->clustermac, ETH_ALEN, 0);
+ 			dev_mc_add(config->dev, config->clustermac);
  		}
  	}
  	cipinfo->config = config;
diff --cc net/ipv4/netfilter/ipt_REJECT.c
index 038fa0bb8f6b,a0e8bcf04159..a86135a28058
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@@ -9,9 -9,10 +9,10 @@@
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
 -
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  #include <linux/module.h>
  #include <linux/skbuff.h>
+ #include <linux/slab.h>
  #include <linux/ip.h>
  #include <linux/udp.h>
  #include <linux/icmp.h>
diff --cc net/ipv6/netfilter/ip6t_REJECT.c
index dad97622ed72,39b50c3768e8..af1d6494ac39
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@@ -14,7 -14,8 +14,9 @@@
   * as published by the Free Software Foundation; either version
   * 2 of the License, or (at your option) any later version.
   */
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/gfp.h>
  #include <linux/module.h>
  #include <linux/skbuff.h>
  #include <linux/icmpv6.h>
diff --cc net/netfilter/nf_conntrack_proto.c
index f71cd5da751c,a44fa75b5178..a6defc793601
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@@ -12,7 -12,9 +12,8 @@@
  #include <linux/types.h>
  #include <linux/netfilter.h>
  #include <linux/module.h>
+ #include <linux/slab.h>
  #include <linux/mutex.h>
 -#include <linux/skbuff.h>
  #include <linux/vmalloc.h>
  #include <linux/stddef.h>
  #include <linux/err.h>
diff --cc net/netfilter/xt_limit.c
index e2a284ebb415,e5d7e1ffb1a4..88215dca19cb
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@@ -5,7 -5,8 +5,9 @@@
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
+ #include <linux/slab.h>
  #include <linux/module.h>
  #include <linux/skbuff.h>
  #include <linux/spinlock.h>