Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

diff --cc Documentation/feature-removal-schedule.txt
index edb2f0b,ec9ef5d..7129846
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -438,9 -438,12 +438,19 @@@ Why:     Superseded by tdfxfb. I2C/DDC supp
  Who:  Jean Delvare <khali@linux-fr.org>
        Krzysztof Helt <krzysztof.h1@wp.pl>
  
 +---------------------------
 +
 +What: CONFIG_RFKILL_INPUT
 +When: 2.6.33
 +Why:  Should be implemented in userspace, policy daemon.
 +Who:  Johannes Berg <johannes@sipsolutions.net>
++
+ ----------------------------
+ 
+ What: CONFIG_X86_OLD_MCE
+ When: 2.6.32
+ Why:  Remove the old legacy 32bit machine check code. This has been
+       superseded by the newer machine check code from the 64bit port,
+       but the old version has been kept around for easier testing. Note this
+       doesn't impact the old P5 and WinChip machine check handlers.
+ Who:  Andi Kleen <andi@firstfloor.org>

diff --cc Documentation/networking/can.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/kernel/signal.c
Simple merge

diff --cc arch/arm/mach-pxa/tosa.c
Simple merge

diff --cc drivers/isdn/mISDN/dsp_core.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/arm/ixp4xx_eth.c
Simple merge

diff --cc drivers/net/b44.h
Simple merge

diff --cc drivers/net/bnx2.c
index f99e17e,3f5fcb0..7e37381
--- 1/drivers/net/bnx2.c
--- 2/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@@ -48,8 -48,11 +48,12 @@@
  #include <linux/cache.h>
  #include <linux/firmware.h>
  #include <linux/log2.h>
 +#include <linux/list.h>
  
+ #if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
+ #define BCM_CNIC 1
+ #include "cnic_if.h"
+ #endif
  #include "bnx2.h"
  #include "bnx2_fw.h"
  

diff --cc drivers/net/bnx2.h
Simple merge

diff --cc drivers/net/e100.c
Simple merge

diff --cc drivers/net/e1000e/e1000.h
Simple merge

diff --cc drivers/net/igbvf/igbvf.h
Simple merge

diff --cc drivers/net/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/mlx4/eq.c
Simple merge

diff --cc drivers/net/mlx4/mr.c
Simple merge

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

diff --cc drivers/net/qlge/qlge_mpi.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

diff --cc drivers/net/tokenring/3c359.c
Simple merge

diff --cc drivers/net/tokenring/lanstreamer.c
Simple merge

diff --cc drivers/net/tokenring/olympic.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/net/wan/ixp4xx_hss.c
Simple merge

diff --cc drivers/net/wireless/Kconfig
Simple merge

diff --cc drivers/net/wireless/iwlwifi/Kconfig
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/Kconfig
index 18ee7d6,1ae11c7..8aab3e6
--- 1/drivers/net/wireless/rt2x00/Kconfig
--- 2/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@@ -75,22 -75,8 +75,22 @@@ config RT73US
          This adds support for rt2501 wireless chipset family.
          Supported chips: RT2571W, RT2573 & RT2671.
  
-         When compiled as a module, this driver will be called "rt73usb.ko".
+         When compiled as a module, this driver will be called rt73usb.
  
 +config RT2800USB
 +      tristate "Ralink rt2800 (USB) support"
 +      depends on USB
 +      select RT2X00_LIB_USB
 +      select RT2X00_LIB_HT
 +      select RT2X00_LIB_FIRMWARE
 +      select RT2X00_LIB_CRYPTO
 +      select CRC_CCITT
 +      ---help---
 +        This adds support for rt2800 wireless chipset family.
 +        Supported chips: RT2770, RT2870 & RT3070.
 +
 +        When compiled as a module, this driver will be called "rt2800usb.ko".
 +
  config RT2X00_LIB_PCI
        tristate
        select RT2X00_LIB

diff --cc drivers/net/wireless/rt2x00/rt2x00lib.h
Simple merge

diff --cc drivers/net/wireless/wavelan_cs.c
Simple merge

diff --cc drivers/of/Kconfig
index 6fe043b,27f3b81..d2fa27c
--- 1/drivers/of/Kconfig
--- 2/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@@ -16,12 -16,6 +16,12 @@@ config OF_I2
  
  config OF_SPI
        def_tristate SPI
-       depends on OF && PPC_OF && SPI
+       depends on OF && (PPC_OF || MICROBLAZE) && SPI
        help
          OpenFirmware SPI accessors
 +
 +config OF_MDIO
 +      def_tristate PHYLIB
 +      depends on OF && PHYLIB
 +      help
 +        OpenFirmware MDIO bus (Ethernet PHY) accessors

diff --cc drivers/scsi/fcoe/fcoe.c
index f791348,e606b48..c15878e
--- 1/drivers/scsi/fcoe/fcoe.c
--- 2/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@@ -219,30 -167,18 +219,42 @@@ static int fcoe_lport_config(struct fc_
  }
  
  /**
 + * fcoe_netdev_cleanup() - clean up netdev configurations
 + * @fc: ptr to the fcoe_softc
 + */
 +void fcoe_netdev_cleanup(struct fcoe_softc *fc)
 +{
 +      u8 flogi_maddr[ETH_ALEN];
 +
 +      /* Don't listen for Ethernet packets anymore */
 +      dev_remove_pack(&fc->fcoe_packet_type);
 +      dev_remove_pack(&fc->fip_packet_type);
 +
 +      /* Delete secondary MAC addresses */
 +      rtnl_lock();
 +      memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
 +      dev_unicast_delete(fc->real_dev, flogi_maddr);
 +      if (!is_zero_ether_addr(fc->ctlr.data_src_addr))
 +              dev_unicast_delete(fc->real_dev, fc->ctlr.data_src_addr);
 +      if (fc->ctlr.spma)
 +              dev_unicast_delete(fc->real_dev, fc->ctlr.ctl_src_addr);
 +      dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
 +      rtnl_unlock();
 +}
 +
 +/**
+  * fcoe_queue_timer() - fcoe queue timer
+  * @lp: the fc_lport pointer
+  *
+  * Calls fcoe_check_wait_queue on timeout
+  *
+  */
+ static void fcoe_queue_timer(ulong lp)
+ {
+       fcoe_check_wait_queue((struct fc_lport *)lp, NULL);
+ }
+ 
+ /**
   * fcoe_netdev_config() - Set up netdev for SW FCoE
   * @lp : ptr to the fc_lport
   * @netdev : ptr to the associated netdevice struct
@@@ -313,24 -248,11 +325,25 @@@ static int fcoe_netdev_config(struct fc
        }
        skb_queue_head_init(&fc->fcoe_pending_queue);
        fc->fcoe_pending_queue_active = 0;
+       setup_timer(&fc->timer, fcoe_queue_timer, (unsigned long)lp);
  
 +      /* look for SAN MAC address, if multiple SAN MACs exist, only
 +       * use the first one for SPMA */
 +      rcu_read_lock();
 +      for_each_dev_addr(netdev, ha) {
 +              if ((ha->type == NETDEV_HW_ADDR_T_SAN) &&
 +                  (is_valid_ether_addr(fc->ctlr.ctl_src_addr))) {
 +                      memcpy(fc->ctlr.ctl_src_addr, ha->addr, ETH_ALEN);
 +                      fc->ctlr.spma = 1;
 +                      break;
 +              }
 +      }
 +      rcu_read_unlock();
 +
        /* setup Source Mac Address */
 -      memcpy(fc->ctlr.ctl_src_addr, fc->real_dev->dev_addr,
 -             fc->real_dev->addr_len);
 +      if (!fc->ctlr.spma)
 +              memcpy(fc->ctlr.ctl_src_addr, fc->real_dev->dev_addr,
 +                     fc->real_dev->addr_len);
  
        wwnn = fcoe_wwn_from_mac(fc->real_dev->dev_addr, 1, 0);
        fc_set_wwnn(lp, wwnn);

diff --cc drivers/scsi/fcoe/libfcoe.c
index b9aa280,9294118..2f5bc7f
--- 1/drivers/scsi/fcoe/libfcoe.c
--- 2/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@@ -427,12 -421,10 +427,12 @@@ static int fcoe_ctlr_encaps(struct fcoe
        memset(mac, 0, sizeof(mac));
        mac->fd_desc.fip_dtype = FIP_DT_MAC;
        mac->fd_desc.fip_dlen = sizeof(*mac) / FIP_BPW;
 -      if (dtype != ELS_FLOGI)
 +      if (dtype != FIP_DT_FLOGI)
                memcpy(mac->fd_mac, fip->data_src_addr, ETH_ALEN);
 +      else if (fip->spma)
 +              memcpy(mac->fd_mac, fip->ctl_src_addr, ETH_ALEN);
  
-       skb->protocol = htons(ETH_P_802_3);
+       skb->protocol = htons(ETH_P_FIP);
        skb_reset_mac_header(skb);
        skb_reset_network_header(skb);
        return 0;

diff --cc include/linux/Kbuild
index 7e09c5c,b3afd22..a2df703
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -308,10 -309,8 +309,9 @@@ unifdef-y += poll.
  unifdef-y += ppp_defs.h
  unifdef-y += ppp-comp.h
  unifdef-y += ptrace.h
- unifdef-y += qnx4_fs.h
  unifdef-y += quota.h
  unifdef-y += random.h
 +unifdef-y += rfkill.h
  unifdef-y += irqnr.h
  unifdef-y += reboot.h
  unifdef-y += reiserfs_fs.h

diff --cc include/linux/if_ether.h
Simple merge

diff --cc include/linux/net_dropmon.h
index e8a8b5c,0e2e100..3ceb0cc
--- 1/include/linux/net_dropmon.h
--- 2/include/linux/net_dropmon.h
+++ b/include/linux/net_dropmon.h
@@@ -1,8 -1,8 +1,9 @@@
  #ifndef __NET_DROPMON_H
  #define __NET_DROPMON_H
  
+ #include <linux/types.h>
  #include <linux/netlink.h>
 +#include <linux/types.h>
  
  struct net_dm_drop_point {
        __u8 pc[8];

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/trace/events/napi.h
index a8989c4,0000000..a8989c4
mode 100644,000000..100644
--- 1/include/trace/napi.h
--- /dev/null
+++ b/include/trace/events/napi.h

diff --cc net/core/dev.c
index ea00e36,e2e9e4a..576a615
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -126,7 -126,6 +126,7 @@@
  #include <linux/in.h>
  #include <linux/jhash.h>
  #include <linux/random.h>
- #include <trace/napi.h>
++#include <trace/events/napi.h>
  
  #include "net-sysfs.h"
  

diff --cc net/core/drop_monitor.c
index a6c2ac2,b75b6ce..9d66fa9
--- 1/net/core/drop_monitor.c
--- 2/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@@ -22,10 -22,8 +22,10 @@@
  #include <linux/timer.h>
  #include <linux/bitops.h>
  #include <net/genetlink.h>
 +#include <net/netevent.h>
  
- #include <trace/skb.h>
- #include <trace/napi.h>
+ #include <trace/events/skb.h>
++#include <trace/events/napi.h>
  
  #include <asm/unaligned.h>
  

diff --cc net/core/net-traces.c
index b07b25b,499a67e..f1e982c
--- 1/net/core/net-traces.c
--- 2/net/core/net-traces.c
+++ b/net/core/net-traces.c
@@@ -25,9 -23,7 +23,10 @@@
  #include <asm/unaligned.h>
  #include <asm/bitops.h>
  
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/skb.h>
++#include <trace/events/napi.h>
  
- DEFINE_TRACE(kfree_skb);
  EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
- DEFINE_TRACE(napi_poll);
 +
 +EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll);

diff --cc net/core/netpoll.c
index 7ab31a7,64f51ee..9675f31
--- 1/net/core/netpoll.c
--- 2/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@@ -24,7 -24,6 +24,7 @@@
  #include <net/tcp.h>
  #include <net/udp.h>
  #include <asm/unaligned.h>
- #include <trace/napi.h>
++#include <trace/events/napi.h>
  
  /*
   * We maintain a small pool of fully-sized skbs, to make sure the

diff --cc net/core/skbuff.c
Simple merge

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

diff --cc net/netfilter/Kconfig
Simple merge

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

diff --cc security/selinux/hooks.c
Simple merge