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>

diff --cc Documentation/feature-removal-schedule.txt
index ea227e3f528b4194cf9a8b60cf232a76da741a16,116a13c4f13f701e48f384d92e8174c41fe10e5c..a1c6e927798673621e05c5229bfdee6fd55e0df5
--- 1/Documentation/feature-removal-schedule.txt
--- 2/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 include/linux/kernel.h
Simple merge

diff --cc net/bridge/br_forward.c
Simple merge

diff --cc net/bridge/br_input.c
Simple merge

diff --cc net/bridge/br_multicast.c
Simple merge

diff --cc net/bridge/br_netfilter.c
Simple merge

diff --cc net/bridge/br_stp_bpdu.c
Simple merge

diff --cc net/bridge/netfilter/ebt_ulog.c
index f77b42d8e87db625913b045da62ceffc9f94ae12,f9560f3dbdc7c9ba538a12b1b637766ecf981db8..852f37c27659bb05a7235ce89ec46287dd87c23d
--- 1/net/bridge/netfilter/ebt_ulog.c
--- 2/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/bridge/netfilter/ebtables.c
Simple merge

diff --cc net/decnet/dn_neigh.c
Simple merge

diff --cc net/decnet/dn_nsp_in.c
Simple merge

diff --cc net/decnet/dn_route.c
Simple merge

diff --cc net/ipv4/ip_forward.c
Simple merge

diff --cc net/ipv4/ip_input.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge

diff --cc net/ipv4/netfilter/ip_queue.c
Simple merge

diff --cc net/ipv4/netfilter/ipt_CLUSTERIP.c
index c6be74e572642b5345a5844c9163141e6e51a4df,a992dc826f1c6245e5a7ec2175c4bb0ef5559b7a..8815d458de463638522ed955b9ca01cdeb5c801e
--- 1/net/ipv4/netfilter/ipt_CLUSTERIP.c
--- 2/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 038fa0bb8f6b02d1e198f240c67133b3a6a2e6b8,a0e8bcf041592cac88b9a623cb001e22cd0b55cd..a86135a280588b4d6d98ed47ec4255b1b1fa9e85
--- 1/net/ipv4/netfilter/ipt_REJECT.c
--- 2/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/ipv4/netfilter/ipt_ULOG.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_rule.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_standalone.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv4/xfrm4_input.c
Simple merge

diff --cc net/ipv6/ip6_input.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/ip6mr.c
Simple merge

diff --cc net/ipv6/mcast.c
Simple merge

diff --cc net/ipv6/ndisc.c
Simple merge

diff --cc net/ipv6/netfilter/ip6_queue.c
Simple merge

diff --cc net/ipv6/netfilter/ip6t_REJECT.c
index dad97622ed7223f13df5c68d686352fbb1dc9002,39b50c3768e8b5c22f293e72c465d4b2aeea2bf2..af1d6494ac39f7506a05acb6acc788b88affe665
--- 1/net/ipv6/netfilter/ip6t_REJECT.c
--- 2/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/ipv6/netfilter/ip6t_hbh.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ftp.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_proto.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_xmit.c
Simple merge

diff --cc net/netfilter/nf_conntrack_ecache.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto.c
index f71cd5da751cf8da78290aa2ab4d0c7de3803431,a44fa75b51783beefa9c44c93b70fba619df5d78..a6defc7936014df69e3b0cc4d70682873b2b9487
--- 1/net/netfilter/nf_conntrack_proto.c
--- 2/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/nfnetlink.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue.c
Simple merge

diff --cc net/netfilter/x_tables.c
Simple merge

diff --cc net/netfilter/xt_CT.c
Simple merge

diff --cc net/netfilter/xt_LED.c
Simple merge

diff --cc net/netfilter/xt_RATEEST.c
Simple merge

diff --cc net/netfilter/xt_TCPMSS.c
Simple merge

diff --cc net/netfilter/xt_connlimit.c
Simple merge

diff --cc net/netfilter/xt_dccp.c
Simple merge

diff --cc net/netfilter/xt_hashlimit.c
Simple merge

diff --cc net/netfilter/xt_limit.c
index e2a284ebb415a3eb71514250e389b18220dcfd35,e5d7e1ffb1a46be8b7a0a21897f4da1a3e1df6cd..88215dca19cbd91b8895c4553f90aedbbbf7ad9e
--- 1/net/netfilter/xt_limit.c
--- 2/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>

diff --cc net/netfilter/xt_quota.c
Simple merge

diff --cc net/netfilter/xt_recent.c
Simple merge

diff --cc net/netfilter/xt_statistic.c
Simple merge

diff --cc net/netfilter/xt_string.c
Simple merge

diff --cc net/sched/act_ipt.c
Simple merge