Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
David S. Miller [Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)]
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c

51 files changed:
1  2 
Documentation/feature-removal-schedule.txt
Documentation/networking/can.txt
MAINTAINERS
arch/arm/kernel/signal.c
arch/arm/mach-pxa/tosa.c
drivers/isdn/mISDN/dsp_core.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/arm/ixp4xx_eth.c
drivers/net/b44.h
drivers/net/bnx2.c
drivers/net/bnx2.h
drivers/net/e100.c
drivers/net/e1000e/e1000.h
drivers/net/igbvf/igbvf.h
drivers/net/mlx4/en_netdev.c
drivers/net/mlx4/eq.c
drivers/net/mlx4/mr.c
drivers/net/qlge/qlge_main.c
drivers/net/qlge/qlge_mpi.c
drivers/net/r8169.c
drivers/net/tokenring/3c359.c
drivers/net/tokenring/lanstreamer.c
drivers/net/tokenring/olympic.c
drivers/net/usb/usbnet.c
drivers/net/virtio_net.c
drivers/net/wan/ixp4xx_hss.c
drivers/net/wireless/Kconfig
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00lib.h
drivers/net/wireless/wavelan_cs.c
drivers/of/Kconfig
drivers/scsi/fcoe/fcoe.c
drivers/scsi/fcoe/libfcoe.c
include/linux/Kbuild
include/linux/if_ether.h
include/linux/net_dropmon.h
include/linux/pci_ids.h
include/linux/sched.h
include/trace/events/napi.h
net/core/dev.c
net/core/drop_monitor.c
net/core/net-traces.c
net/core/netpoll.c
net/core/skbuff.c
net/ipv6/addrconf.c
net/netfilter/Kconfig
net/sched/cls_cgroup.c
security/selinux/hooks.c

@@@ -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>
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #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"
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
@@@ -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
@@@ -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);
@@@ -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;
@@@ -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
Simple merge
@@@ -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];
Simple merge
Simple merge
index a8989c4,0000000..a8989c4
mode 100644,000000..100644
--- /dev/null
diff --cc net/core/dev.c
  #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"
  
  #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>
  
  #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);
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge