Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
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

index edb2f0b076168deee52986ffdba744e05d7fabf4,ec9ef5d0d7b3b3af5d12c595edd7ddb048be6f2b..7129846a27851a9e61d817e396802edc7e2eac3e
@@@ -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
index f99e17e0a319248e1ea7e1be4bfa627939167c99,3f5fcb0156a180a49977f200b7a16fe5e19f6a38..7e3738112c4e64297c00b0c74a7658d9df4a00c8
  #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
index 18ee7d6c4028af9fb1f04f3783159f0cfb3ef623,1ae11c7f17affe210ed50782611c15f6db99796d..8aab3e6754bdae25d331ca1b0f627d96d6622820
@@@ -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
index 6fe043bd3770414cb087c97c4e33af44fa86f400,27f3b81333dec00bf0c5c212b2f0162261a40564..d2fa27c5c1b28e444748214e363bb3c462a43f0e
@@@ -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
index f791348871fc36d25eb750951fa3ec438e578ccc,e606b4829d4430684a973c743d721bf81ba66d1f..c15878e881570e6ae6344b92869b1457840e7f69
@@@ -218,30 -166,18 +218,42 @@@ static int fcoe_lport_config(struct fc_
        return 0;
  }
  
 +/**
 + * 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
@@@ -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);
index b9aa280100b08a07d23b16d2e7bf82cb5519693c,929411880e4b16c010ca7ca3d7369fddec6abd88..2f5bc7fd3fa90c5c3834fef6a377e025feb70f9f
@@@ -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;
index 7e09c5c1ed027cc4f49740d6b706a49a95af1ee4,b3afd2219ad2e61baa8cc5ad607cd207192d442b..a2df7030d49d2fa11067bb4ad8d714937644e54d
@@@ -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
index e8a8b5c50ed0d0862254017f86454c9fb53d909c,0e2e100c44a275f719377d7c0e2ad113743d404d..3ceb0cc1bc787382dd00d3ea27292422f161881b
@@@ -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 a8989c4547e7e7b790140957dcaaa3c7917952cd,0000000000000000000000000000000000000000..a8989c4547e7e7b790140957dcaaa3c7917952cd
mode 100644,000000..100644
--- /dev/null
diff --cc net/core/dev.c
index ea00e36f48e175c51c30c0b94f253f16f5be0989,e2e9e4af3ace6c2975ebab961f20c5bbf3aa0157..576a61574a936fcab9a7608d2d83c677127aebb6
  #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"
  
index a6c2ac2828fb22269594621a1892c7d631dd2fee,b75b6cea49dab47cbca9098a259ac44e4e51b4c8..9d66fa953ab7bdbb160090e3544e038dff658eae
  #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>
  
index b07b25bd2cde44315313a24d9c8d9a10ef54fb71,499a67eaf3ae201262c4a2e53f20870721b8f184..f1e982c508bb16df812024014d953c184e777247
  #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);
index 7ab31a7576a17c3a7fe7560d11e78007d2bc6218,64f51eec6576290e3b2df361316ee5448396642d..9675f312830dd762bcd530eee90569de5a89b320
@@@ -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