Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Wed, 8 Oct 2008 21:56:41 +0000 (14:56 -0700)]
Conflicts:

drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c

1  2 
MAINTAINERS
drivers/net/e1000e/e1000.h
drivers/net/e1000e/ethtool.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
drivers/net/e1000e/param.c
net/core/dev.c
net/core/rtnetlink.c
net/ipv4/tcp_input.c

diff --cc MAINTAINERS
Simple merge
@@@ -321,8 -306,8 +322,9 @@@ struct e1000_info 
  #define FLAG_HAS_CTRLEXT_ON_LOAD          (1 << 5)
  #define FLAG_HAS_SWSM_ON_LOAD             (1 << 6)
  #define FLAG_HAS_JUMBO_FRAMES             (1 << 7)
+ #define FLAG_READ_ONLY_NVM                (1 << 8)
  #define FLAG_IS_ICH                       (1 << 9)
 +#define FLAG_HAS_MSIX                     (1 << 10)
  #define FLAG_HAS_SMART_POWER_DOWN         (1 << 11)
  #define FLAG_IS_QUAD_PORT_A               (1 << 12)
  #define FLAG_IS_QUAD_PORT                 (1 << 13)
Simple merge
@@@ -398,8 -419,8 +424,10 @@@ static s32 e1000_acquire_swflag_ich8lan
  
        if (!timeout) {
                hw_dbg(hw, "FW or HW has locked the resource for too long.\n");
 +              extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
 +              ew32(EXTCNF_CTRL, extcnf_ctrl);
+               nvm_owner = -1;
+               mutex_unlock(&nvm_mutex);
                return -E1000_ERR_CONFIG;
        }
  
@@@ -2905,10 -2600,14 +2913,8 @@@ static int __devinit e1000_sw_init(stru
        /* Explicitly disable IRQ since the NIC can be in any state. */
        e1000_irq_disable(adapter);
  
-       spin_lock_init(&adapter->stats_lock);
        set_bit(__E1000_DOWN, &adapter->state);
        return 0;
 -
 -err:
 -      e_err("Unable to allocate memory for queues\n");
 -      kfree(adapter->rx_ring);
 -      kfree(adapter->tx_ring);
 -      return -ENOMEM;
  }
  
  /**
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge