korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
6ba74014c1
linux/drivers/infiniband/hw/cxgb4
History
Linus Torvalds 6ba74014c1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
  phy/marvell: add 88ec048 support
  igb: Program MDICNFG register prior to PHY init
  e1000e: correct MAC-PHY interconnect register offset for 82579
  hso: Add new product ID
  can: Add driver for esd CAN-USB/2 device
  l2tp: fix export of header file for userspace
  can-raw: Fix skb_orphan_try handling
  Revert "net: remove zap_completion_queue"
  net: cleanup inclusion
  phy/marvell: add 88e1121 interface mode support
  u32: negative offset fix
  net: Fix a typo from "dev" to "ndev"
  igb: Use irq_synchronize per vector when using MSI-X
  ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
  e1000e: Fix irq_synchronize in MSI-X case
  e1000e: register pm_qos request on hardware activation
  ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
  net: Add getsockopt support for TCP thin-streams
  cxgb4: update driver version
  cxgb4: add new PCI IDs
  ...

Manually fix up conflicts in:
 - drivers/net/e1000e/netdev.c: due to pm_qos registration
   infrastructure changes
 - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
   and cleaning up the IDs
 - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
   conflict (registration change vs marking it static)
2010-08-04 11:47:58 -07:00
..
cm.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-08-04 11:47:58 -07:00
cq.c RDMA/cxgb4: Avoid false GTS CIDX_INC overflows 2010-07-06 14:04:04 -07:00
device.c RDMA/cxgb4: Register RDMA provider based on LLD state_change events 2010-05-24 21:07:59 -07:00
ev.c MAINTAINERS: Add cxgb4 and iw_cxgb4 entries 2010-05-05 14:45:40 -07:00
iw_cxgb4.h RDMA/cxgb4: Use the DMA state API instead of the pci equivalents 2010-07-06 14:01:42 -07:00
Kconfig
Makefile
mem.c RDMA/cxgb4: Use the DMA state API instead of the pci equivalents 2010-07-06 14:01:42 -07:00
provider.c Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-next 2010-05-25 09:54:03 -07:00
qp.c RDMA/cxgb4: Use the DMA state API instead of the pci equivalents 2010-07-06 14:01:42 -07:00
resource.c
t4.h RDMA/cxgb4: Use the DMA state API instead of the pci equivalents 2010-07-06 14:01:42 -07:00
t4fw_ri_api.h
user.h