Linus Torvalds 2490138cb7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (48 commits) RDMA/iwcm: Reject the connection when the cm_id is destroyed RDMA/cxgb3: Clean up properly on FW mismatch failures RDMA/cxgb3: Don't ignore insert_handle() failures MAINTAINERS: InfiniBand/RDMA mailing list transition to vger IB/mad: Allow tuning of QP0 and QP1 sizes IB/mad: Fix possible lock-lock-timer deadlock RDMA/nes: Map MTU to IB_MTU_* and correctly report link state RDMA/nes: Rework the disconn routine for terminate and flushing RDMA/nes: Use the flush code to fill in cqe error RDMA/nes: Make poll_cq return correct number of wqes during flush RDMA/nes: Use flush mechanism to set status for wqe in error RDMA/nes: Implement Terminate Packet RDMA/nes: Add CQ error handling RDMA/nes: Clean out CQ completions when QP is destroyed RDMA/nes: Change memory allocation for cqp request to GFP_ATOMIC RDMA/nes: Allocate work item for disconnect event handling RDMA/nes: Update refcnt during disconnect IB/mthca: Don't allow userspace open while recovering from catastrophic error IB/mthca: Distinguish multiple devices in /proc/interrupts IB/mthca: Annotate CQ locking ...		2009-09-11 08:58:32 -07:00
..
appletalk	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
arcnet	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
arm	net: Rename MAC platform driver for w90p910 platform	2009-08-18 23:34:58 -07:00
atl1c	atlx: strncpy does not null terminate string	2009-08-09 21:45:31 -07:00
atl1e	atl1*: add device_set_wakeup_enable to atl1*_set_wol	2009-06-25 02:58:17 -07:00
atlx	atlx: strncpy does not null terminate string	2009-08-09 21:45:31 -07:00
benet	be2net: Bug fix in the non-lro path. Size of received packet was not updated in statistics properly.	2009-07-22 09:28:55 -07:00
bonding	bonding: clean muticast addresses when device changes type	2009-07-16 18:05:23 -07:00
can	can: fix oops caused by wrong rtnl newlink usage	2009-08-13 16:33:01 -07:00
chelsio
cris
cxgb3	RDMA/cxgb3: Handle port events properly	2009-09-05 20:22:38 -07:00
e1000	e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error	2009-06-30 19:47:00 -07:00
e1000e	e1000e: fix use of pci_enable_pcie_error_reporting	2009-08-15 18:52:59 -07:00
ehea	ehea: Fix napi list corruption on ifconfig down	2009-08-04 11:48:39 -07:00
enic
fs_enet	fs_enet: Revive fixed link support	2009-07-22 09:27:19 -07:00
hamradio	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-22 09:49:58 -07:00
ibm_newemac	ibm_newemac: emac_close() needs to call netif_carrier_off()	2009-08-20 02:21:27 -07:00
igb	igb: gcc-3.4.6 fix	2009-07-13 11:11:41 -07:00
igbvf	igbvf: Allow VF driver to correctly recognize failure to set mac	2009-08-04 11:46:41 -07:00
irda	irda/sa1100_ir: fix broken netdev_ops conversion	2009-08-25 20:39:37 -07:00
ixgb	net: skb_shared_info optimization	2009-06-08 00:21:48 -07:00
ixgbe	ixgbe: Fix receive on real device when VLANs are configured	2009-08-13 20:13:23 -07:00
ixp2000	drivers/net: fixed drivers that support netpoll use ndo_start_xmit()	2009-08-23 19:51:03 -07:00
mlx4	mlx4_core: Distinguish multiple devices in /proc/interrupts	2009-09-05 20:24:50 -07:00
myri10ge	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
netxen	netxen: free napi resources during detach	2009-08-13 16:33:04 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-22 09:49:58 -07:00
phy	net: Rework mdio-ofgpio driver to use of_mdio infrastructure	2009-07-23 10:56:48 -07:00
qlge	qlge: Fix sizeof usage.	2009-07-03 19:10:51 -07:00
sfc	sfc: Expose 100/1000BASE-T MDI-X status via ethtool	2009-06-11 02:47:11 -07:00
skfp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
tokenring	tokenring: Read buffer overflow	2009-07-26 18:50:39 -07:00
tulip	drivers/net: fixed drivers that support netpoll use ndo_start_xmit()	2009-08-14 16:41:16 -07:00
usb	pegasus: Add new device ID.	2009-08-14 16:41:17 -07:00
vxge	vxge: Enable SRIOV support in the driver.	2009-06-17 04:31:14 -07:00
wan	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
wimax	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
wireless	ipw2200: firmware DMA loading rework	2009-08-28 14:35:32 -04:00
3c59x.c	Add IDs for 3C905B-TX Fast Etherlink XL PCI	2009-08-05 20:23:07 -07:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c505.h
3c507.c
3c509.c
3c515.c	3c515: Write outside array bounds	2009-07-30 13:27:28 -07:00
3c523.c
3c523.h
3c527.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c527.h
7990.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
7990.h
8139cp.c	8139cp: balance dma_map_single vs dma_unmap_single pair	2009-08-12 22:18:14 -07:00
8139too.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
8390.c
8390.h
8390p.c
82596.c
a2065.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
a2065.h
ac3200.c
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c	at1700: Read buffer overflow	2009-07-26 18:50:38 -07:00
atarilance.c
atp.c
atp.h
au1000_eth.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
au1000_eth.h
ax88796.c
b44.c	drivers/net: fixed drivers that support netpoll use ndo_start_xmit()	2009-08-14 16:41:16 -07:00
b44.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
bfin_mac.c
bfin_mac.h
bmac.c	Fix compile error in bmac.c	2009-07-09 20:32:31 -07:00
bmac.h
bnx2_fw.h
bnx2.c	bnx2: Use mutex on slow path cnic calls.	2009-08-15 18:50:44 -07:00
bnx2.h	bnx2: Use mutex on slow path cnic calls.	2009-08-15 18:50:44 -07:00
bnx2x_dump.h
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h
bnx2x_init_ops.h
bnx2x_init.h
bnx2x_link.c	drivers/net: Move a dereference below a NULL test	2009-07-21 13:00:44 -07:00
bnx2x_link.h
bnx2x_main.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
bnx2x_reg.h
bnx2x.h	bnx2x: Fix the maximal values of coalescing timeouts.	2009-07-05 18:03:23 -07:00
bsd_comp.c
cassini.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
cassini.h
cnic_defs.h	[SCSI] cnic: Add new Broadcom CNIC driver.	2009-06-09 10:22:42 -05:00
cnic_if.h	cnic: Fix locking in init/exit calls.	2009-08-15 18:50:47 -07:00
cnic.c	cnic: Fix locking in init/exit calls.	2009-08-15 18:50:47 -07:00
cnic.h	cnic: Fix locking in start/stop calls.	2009-08-15 18:50:44 -07:00
cpmac.c	cpmac: fix compilation failure introduced with netdev_ops conversion	2009-06-24 18:03:11 -07:00
cs89x0.c	drivers/net: using spin_lock_irqsave() in net_send_packet()	2009-07-14 12:03:41 -07:00
cs89x0.h
davinci_emac.c	davinci_emac: fix kernel oops when changing MAC address while interface is down	2009-07-08 10:46:44 -07:00
de600.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
de600.h
de620.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
de620.h
declance.c	declance: Restore tx descriptor ring locking	2009-06-08 02:42:35 -07:00
defxx.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
defxx.h
depca.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
depca.h
dl2k.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
dl2k.h
dm9000.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c	E100: fix interaction with swiotlb on X86.	2009-08-23 19:02:13 -07:00
e2100.c
eepro.c	eepro: Read buffer overflow	2009-07-26 18:53:17 -07:00
eexpress.c	eexpress: Read buffer overflow	2009-07-30 13:27:34 -07:00
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
eql.c
es3210.c
eth16i.c
ethoc.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
ewrk3.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ewrk3.h
fealnx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-27 13:42:47 -07:00
fec_mpc52xx_phy.c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
fec_mpc52xx.c	drivers/net: fixed drivers that support netpoll use ndo_start_xmit()	2009-08-23 19:51:03 -07:00
fec_mpc52xx.h
fec.c	fec: fix FEC driver packet transmission breakage	2009-08-09 21:45:33 -07:00
fec.h	fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register	2009-07-06 18:56:11 -07:00
forcedeth.c	forcedeth: Fix NAPI race.	2009-07-05 18:03:33 -07:00
fsl_pq_mdio.c	fsl_pq_mdio: Fix fsl_pq_mdio to work with modules	2009-06-25 20:03:53 -07:00
fsl_pq_mdio.h
gianfar_ethtool.c	gianfar: fix coalescing setup in ethtool support	2009-07-30 14:20:42 -07:00
gianfar_sysfs.c
gianfar.c	gianfar: Fix build.	2009-09-06 01:41:24 -07:00
gianfar.h
hamachi.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
hp100.c	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c	net: ntohs() misuse	2009-06-11 17:23:24 -07:00
ipg.c
ipg.h	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
isa-skeleton.c	drivers/net: using spin_lock_irqsave() in net_send_packet()	2009-07-14 12:03:41 -07:00
iseries_veth.c
jazzsonic.c	macsonic, jazzsonic: fix oops on module unload	2009-07-21 12:21:49 -07:00
jme.c
jme.h
Kconfig	net: Fix Micrel KSZ8842 Kconfig description	2009-08-23 19:47:03 -07:00
korina.c
ks8842.c	netdev: Added KS8842 driver	2009-06-08 00:20:20 -07:00
ks8851.c	net: Micrel KS8851 SPI network driver	2009-07-20 08:23:26 -07:00
ks8851.h	net: Micrel KS8851 SPI network driver	2009-07-20 08:23:26 -07:00
lance.c
lasi_82596.c
lib8390.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
lib82596.c
LICENSE.SRC
ll_temac_main.c
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c
lp486e.c
mac89x0.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
mac8390.c
macb.c	drivers/net: fixed drivers that support netpoll use ndo_start_xmit()	2009-08-23 19:51:03 -07:00
macb.h
mace.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
mace.h
macmace.c
macsonic.c	macsonic, jazzsonic: fix oops on module unload	2009-07-21 12:21:49 -07:00
macvlan.c	drivers/net/macvlan.c: fix cloning of tagged VLAN interfaces	2009-06-11 02:32:39 -07:00
Makefile	net: Micrel KS8851 SPI network driver	2009-07-20 08:23:26 -07:00
mdio.c	mdio add missing GPL flag	2009-06-25 20:06:34 -07:00
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: fix unicast filter programming in promiscuous mode	2009-06-19 01:12:52 -07:00
mvme147.c
myri_sbus.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
myri_sbus.h
natsemi.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ni65.h
ni5010.c
ni5010.h
niu.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
niu.h	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
ns83820.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
pcnet32.c	pcnet32: Read buffer overflow	2009-08-09 21:45:48 -07:00
plip.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
ppp_async.c	Revert "ppp: Fix throttling bugs"	2009-07-16 09:14:23 -07:00
ppp_deflate.c
ppp_generic.c	ppp: fix lost fragments in ppp_mp_explode() (resubmit)	2009-08-02 12:20:31 -07:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c	Revert "ppp: Fix throttling bugs"	2009-07-16 09:14:23 -07:00
pppoe.c	pppoe: fix /proc/net/pppoe	2009-07-30 14:19:19 -07:00
pppol2tp.c	pppol2tp: calls unregister_pernet_gen_device() at unload time	2009-08-02 12:20:34 -07:00
pppox.c
ps3_gelic_net.c	netdev: restore MAC address set and validate operations	2009-07-12 14:20:02 -07:00
ps3_gelic_net.h
ps3_gelic_wireless.c	netdev: restore MAC address set and validate operations	2009-07-12 14:20:02 -07:00
ps3_gelic_wireless.h
qla3xxx.c	qla3xxx: Don't sleep while holding lock.	2009-06-23 16:36:27 -07:00
qla3xxx.h
r6040.c	r6040: bump driver version to 0.24 and date to 08 July 2009	2009-07-08 10:49:28 -07:00
r8169.c	r8169: WakeOnLan fix for the 8168	2009-07-26 20:18:52 -07:00
rionet.c
rrunner.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
rrunner.h
s2io-regs.h
s2io.c	s2io: Remove private boolean definitions	2009-06-08 00:20:22 -07:00
s2io.h	s2io: Remove private boolean definitions	2009-06-08 00:20:22 -07:00
s6gmac.c	s6gmac: Read buffer overflow	2009-08-02 12:20:40 -07:00
sb1000.c
sb1250-mac.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sc92031.c	New device ID for sc92031 [1088:2031]	2009-07-20 08:27:02 -07:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	sh_eth: remove redundant test on unsigned	2009-06-25 20:03:56 -07:00
sh_eth.h
sis190.c	sis190: use an adequate phy list entry as a fallback	2009-06-17 18:46:46 -07:00
sis900.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sis900.h
skge.c	skge: Enable WoL by default if supported	2009-07-22 11:24:26 -07:00
skge.h
sky2.c	sky2: Avoid transmits during sky2_down()	2009-08-03 19:02:36 -07:00
sky2.h	sky2: Avoid transmits during sky2_down()	2009-08-03 19:02:36 -07:00
slhc.c
slip.c
slip.h
smc91x.c	smc91x: fix compilation on SMP	2009-08-26 12:03:35 -07:00
smc91x.h	smc91x.h: add config for Nomadik evaluation kit	2009-07-26 19:15:07 -07:00
smc911x.c
smc911x.h
smc9194.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c	sonic: Fix build after ndo_start_xmit() changes.	2009-06-17 01:36:23 -07:00
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
stnic.c
sun3_82586.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sun3_82586.h
sun3lance.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sunbmac.c
sunbmac.h
sundance.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
sunvnet.h
tc35815.c
tehuti.c	tehuti: No need check vfree() pointer.	2009-06-11 02:47:14 -07:00
tehuti.h
tg3.c	net: skb_shared_info optimization	2009-06-08 00:21:48 -07:00
tg3.h
tlan.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
tlan.h
tsi108_eth.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
tsi108_eth.h
tun.c	lsm: Add hooks to the TUN driver	2009-09-01 08:29:48 +10:00
typhoon.c
typhoon.h
ucc_geth_ethtool.c	trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.	2009-06-12 18:01:46 +02:00
ucc_geth.c	drivers/net: fixed drivers that support netpoll use ndo_start_xmit()	2009-08-14 16:41:16 -07:00
ucc_geth.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
veth.c	Revert "veth: prevent oops caused by netdev destructor"	2009-06-25 02:45:42 -07:00
via-rhine.c	drivers/net: fixed drivers that support netpoll use ndo_start_xmit()	2009-08-14 16:41:16 -07:00
via-velocity.c	via-velocity: Fix test of mii_status bit VELOCITY_DUPLEX_FULL	2009-08-14 16:30:37 -07:00
via-velocity.h
virtio_net.c	virtio: net refill on out-of-memory	2009-08-26 12:22:32 -07:00
wd.c
xen-netfront.c	xen: remove driver_data direct access of struct device from more drivers	2009-06-15 21:30:28 -07:00
xtsonic.c
yellowfin.c	yellowfin: Fix buffer underrun after dev_alloc_skb() failure	2009-08-18 20:21:40 -07:00
znet.c
zorro8390.c	zorro8390: Fix read buffer overflow in zorro8390_init_one()	2009-08-09 21:46:53 -07:00