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

Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h

diff --cc drivers/net/atlx/atl2.c
Simple merge

diff --cc drivers/net/benet/be_cmds.c
Simple merge

diff --cc drivers/net/benet/be_cmds.h
index 6eed512,c002b83..cb3188f
--- 1/drivers/net/benet/be_cmds.h
--- 2/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@@ -926,5 -926,5 +940,8 @@@ extern int be_cmd_loopback_test(struct 
                                u32 num_pkts, u64 pattern);
  extern int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,
                        u32 byte_cnt, struct be_dma_mem *cmd);
 +extern int be_cmd_get_seeprom_data(struct be_adapter *adapter,
 +                              struct be_dma_mem *nonemb_cmd);
+ extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
+                               u8 loopback_type, u8 enable);
++

diff --cc drivers/net/benet/be_ethtool.c
Simple merge

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

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/igbvf/netdev.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic.h
Simple merge

diff --cc drivers/net/netxen/netxen_nic_init.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_main.c
Simple merge

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

diff --cc drivers/net/pcmcia/pcnet_cs.c
Simple merge

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

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

diff --cc drivers/net/sfc/efx.c
Simple merge

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

diff --cc drivers/net/tulip/dmfe.c
Simple merge

diff --cc drivers/net/tulip/tulip_core.c
Simple merge

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

diff --cc drivers/net/via-rhine.c
Simple merge

diff --cc drivers/net/via-velocity.c
Simple merge

diff --cc drivers/net/vxge/vxge-main.c
Simple merge

diff --cc drivers/net/wireless/libertas/mesh.c
Simple merge

diff --cc drivers/scsi/cxgb3i/cxgb3i_offload.c
index 26ffdcd,7449d46..2a3cf82
--- 1/drivers/scsi/cxgb3i/cxgb3i_offload.c
--- 2/drivers/scsi/cxgb3i/cxgb3i_offload.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c
@@@ -1563,9 -1567,29 +1567,29 @@@ free_tid
        s3_free_atid(cdev, c3cn->tid);
        c3cn->tid = 0;
  out_err:
 -      return -1;
 +      return -EINVAL;
  }
  
+ /* *
+  * cxgb3i_find_dev - find the interface associated with the given address
+  * @ipaddr: ip address
+  */
+ static struct net_device *
+ cxgb3i_find_dev(struct net_device *dev, __be32 ipaddr)
+ {
+       struct flowi fl;
+       int err;
+       struct rtable *rt;
+ 
+       memset(&fl, 0, sizeof(fl));
+       fl.nl_u.ip4_u.daddr = ipaddr;
+ 
+       err = ip_route_output_key(dev ? dev_net(dev) : &init_net, &rt, &fl);
+       if (!err)
+               return (&rt->u.dst)->dev;
+ 
+       return NULL;
+ }
  
  /**
   * cxgb3i_c3cn_connect - initiates an iscsi tcp connection to a given address

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

diff --cc include/linux/sysctl.h
index 24ff7e3,bd27fbc..9f236cd
--- 1/include/linux/sysctl.h
--- 2/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@@ -482,7 -482,7 +482,8 @@@ enu
        NET_IPV4_CONF_ARP_ACCEPT=21,
        NET_IPV4_CONF_ARP_NOTIFY=22,
        NET_IPV4_CONF_ACCEPT_LOCAL=23,
-       NET_IPV4_CONF_PROXY_ARP_PVLAN=24,
+       NET_IPV4_CONF_SRC_VMARK=24,
++      NET_IPV4_CONF_PROXY_ARP_PVLAN=25,
        __NET_IPV4_CONF_MAX
  };
  

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