commit 872aad45d6174570dd2e1defc3efee50f2cfcc72 Author: Alan Cox Date: Tue Jul 3 15:14:05 2007 +0100 pata_pcmcia: Switch to ata_sff_port_start PCMCIA doesn't use DMA and as this driver is used on many platforms we don't want it to fail on those that define the DMA alloc API as a NULL return Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit a0ac38f16045f90dbbcd265b638cd7254c53aa65 Author: Alan Cox Date: Tue Jul 3 15:15:13 2007 +0100 pata_pdc202xx_old: Correct cable detect logic We got it backwards and now the other detects are fixed it shows up Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit d6f4d5eafdd0bbdaa166a0650d27045c26ca63dd Author: Alan Cox Date: Tue Jul 3 15:11:30 2007 +0100 ata_generic: Check the right register for the DMA enabled flags Mirrors change in IT821X Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit ee5815023527dd579ada340786e329ff6c5c0eea Author: Chuck Ebbert Date: Mon Jun 25 19:13:32 2007 -0400 pata_ali: fix UDMA settings This patch was found to fix some of the problems with the pata_ali driver. https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=156482 Signed-off-by: Jeff Garzik commit d9f9c6bc91c14f53ffa782ffcd42259ecae1d38c Author: Florian Attenberger Date: Mon Jul 2 17:09:29 2007 +0200 sata_mv: PCI-ID for Adaptec 1430SA SATA Controller Signed-off-by: Florian Attenberger Signed-off-by: Jeff Garzik commit 4031826b3ca40982880f6b9f2282c7d7fad60d77 Author: Tejun Heo Date: Tue Jul 3 01:38:47 2007 +0900 libata: fix assigned IRQ reporting host->irq and host->irq2 should be set before ata_host_register() for IRQ reporting to work. Move up host->irq assignment in ata_host_activate() and add it to ata_pci_init_one() native path and pata_cs5520. The port info printing in ata_host_register() doesn't fit all the different controllers. It should probably be moved out to LLDs with some helpers in the future. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit aa2e09da2a332e748532aa2a71b090e7e7c3203d Author: Len Brown Date: Mon Jul 2 23:57:45 2007 -0400 ACPI: fix acpi_osi=!Linux Need to check for special case "acpi_osi=!Linux" before handling the general case "acpi_osi=!*", or it will have no effect. Signed-off-by: Len Brown Signed-off-by: Linus Torvalds commit 52c4d73a6cca0db2927b60935e57429f98eae7c1 Merge: ca9c5ff... 841adfc... Author: Linus Torvalds Date: Mon Jul 2 21:05:35 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB/cm: Partial error clean up unmaps wrong address mlx4_core: Add new Mellanox device IDs commit ca9c5ffd9d12e136f72fa52840cda83485d586cd Merge: c1fa238... 7718457... Author: Linus Torvalds Date: Mon Jul 2 21:05:14 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: remove zero-sized include/asm-blackfin/macros.h Blackfin arch: update board defconfig files Blackfin arch: Fix up remaining printks with proper log levels Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration commit c1fa238762ad2518ab6003983c16508470be6d81 Merge: b59449b... 531e3a6... Author: Linus Torvalds Date: Mon Jul 2 21:04:36 2007 -0700 Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] sata_nv: undo merge error commit b59449bea276793b8f228ea07bcb861670d79d75 Merge: fffe566... 63ac9b9... Author: Linus Torvalds Date: Mon Jul 2 21:01:38 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: 3c589_cs: fix local_bh_enable warning RESEND [PATCH 3/3] NetXen: Graceful teardown of interface and hardware upon module unload drivers/net/ns83820.c: fix a check-after-use net/usb/cdc_ether minor sparse cleanup RESEND [PATCH 2/3] NetXen: Support per PCI-function interrupt mask registers RESEND [PATCH 1/3] NetXen: Fix issue of MSI not working correctly dm9601: Return 0 from bind() on success Update MAINTAINERS for USB network devices usbnet: Zero padding byte if there is tail room in skb dm9601: HW header size shouldn't be included in packet length starfire list alpha as 64 bit arch myri10ge: SET_NETDEV_DEV() gianfar: Fix typo bug introduced by move to udp_hdr() [PATCH] libertas: remove private ioctls [PATCH] libertas: fix WPA associations by handling ENABLE_RSN correctly [PATCH] libertas: kill wlan_scan_process_results [PATCH] libertas: style fixes commit fffe566b8f735fa71b38c7cc487b471b85894401 Merge: dcf87a2... a3cabb2... Author: Linus Torvalds Date: Mon Jul 2 21:01:13 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: PATA-mode fixes for sis_sata libata: add HTS541616J9SA00 to NCQ blacklist sata_nv: allow changing queue depth sata_inic162x: disable LBA48 devices libata: remove reading alt_status from ata_hsm_qc_complete() libata: pata_pdc2027x PLL input clock fix scsi disk help file is not complete commit dcf87a2e357e277d3f3e3661962703b80113d2f8 Merge: a38d618... fe77d4f... Author: Linus Torvalds Date: Mon Jul 2 20:59:54 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: add Kconfig help on building both stacks firewire: fix async reception on big endian machines commit 841adfca9c5fc0fec6b1f0b2e5eb7a3b239a7730 Author: Ralph Campbell Date: Fri Jun 29 11:37:56 2007 -0700 IPoIB/cm: Partial error clean up unmaps wrong address If a page can't be allocated for the frag list of a skb, the code to unmap the partially allocated list is off by one. For exaple, if 'frags' equals one, i == 0, and the alloc_page() fails, then the old loop would have unmapped mapping[1] which is uninitialized. The same would happen if the call to ib_dma_map_page() failed. Signed-off-by: Ralph Campbell Acked-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 786f238e4f2f0d962831ee3228f2327133eb082a Author: Jack Morgenstein Date: Mon Jul 2 17:36:18 2007 +0300 mlx4_core: Add new Mellanox device IDs Add new IDs for PCIe gen2 devices. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 7718457dc8fd98a9f61a5e42653161bac3904a65 Author: Marco Roeland Date: Tue Jul 3 08:25:50 2007 +0800 Blackfin arch: remove zero-sized include/asm-blackfin/macros.h This file accidentally got truncated instead of deleted in commit df30b11. Signed-off-by: Marco Roeland Cc: Robert P. J. Day Cc: Jeff Garzik Cc: Jesper Juhl Cc: Alex Riesen Cc: Robin Getz Acked-by: Bryan Wu commit 531e3a61f55261bf466d0415c48999511334933c Author: Jeff Garzik Date: Mon Jul 2 18:12:19 2007 -0400 [libata] sata_nv: undo merge error Only the ADMA entry was supposed to be able to change queue depth. Signed-off-by: Jeff Garzik commit 63ac9b915924d1237d2135fcb4de724e6127ca5e Author: Patrick McHardy Date: Mon Jul 2 16:08:28 2007 +0200 3c589_cs: fix local_bh_enable warning Russell King wrote: > Having upgraded from 2.6.16 to 2.6.22-rc6, I'm now seeing the following. > > Looks like netfilter is calling local_bh_enable() with IRQs disabled, > which would appear to be illegal. Thankfully, this is a warn-once > warning. > > WARNING: at /home/rmk/git/linux-2.6-rmk/kernel/softirq.c:138 local_bh_enable() > [...] > [] (nf_conntrack_destroy+0x0/0x2c) from [] (__kfree_skb+0xd0/0x100) > [] (__kfree_skb+0x0/0x100) from [] (kfree_skb+0x4c/0x50) > r5:c12a3800 r4:00000300 > [] (kfree_skb+0x0/0x50) from [] (el3_start_xmit+0xb8/0xd0 [3c589_cs]) > [] (el3_start_xmit+0x0/0xd0 [3c589_cs]) from [] (dev_hard_start_xmit+0x1a8/0x244) > r7:c12a3800 r6:c1a9aa00 r5:c1a9aa00 r4:c12a3800 > [] (dev_hard_start_xmit+0x0/0x244) from [] (__qdisc_run+0xb0/0x198) Thats a bug in the 3c589_cs driver. Patch attached. Signed-off-by: Patrick McHardy Signed-off-by: Jeff Garzik commit a3cabb271ea66739704497102536fb01bb72fe37 Author: Uwe Koziolek Date: Thu Jun 14 23:40:43 2007 +0200 libata: PATA-mode fixes for sis_sata Changed PATA handler for PATA-ports used by sata_sis. This patch was originally submitted by Jeff Garzik. Added PCI-ID 1180 for SiS966 Controller in pata_sis. The 1180 mode is fully compatible to other SiS PATA-controller. The PCI-ID 1183 is SATA in PATA-emulation, but not fully compatible to SiS5513/5518. sata_sis.c is forwarding this ID to pata_sis. 1183 is not working if simply added to pata_sis. This handling fixes issues with SiS968. Signed-off-by: Uwe Koziolek Signed-off-by: Jeff Garzik commit e14cbfa630cd3ab2631ee21b718b290928f47868 Author: Tejun Heo Date: Mon Jun 25 11:28:59 2007 +0900 libata: add HTS541616J9SA00 to NCQ blacklist Another member of HTS5416* family doing spurious NCQ completion. Signed-off-by: Tejun Heo Cc: Enrico Sardi Signed-off-by: Jeff Garzik commit 1e0b5ab81e2abb8bbf7446f4a17f43a1e34944fe Author: Robert Hancock Date: Thu Jun 28 18:52:24 2007 -0600 sata_nv: allow changing queue depth The sata_nv driver was missing the change_queue_depth hook in the SCSI host template which the other NCQ-capable libata drivers had. This made it impossible to change the queue depth by user request. Add this in. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 90c937853d792ea997d7fdec72dbbea4f92e12c4 Author: Tejun Heo Date: Fri Jun 29 11:33:08 2007 +0900 sata_inic162x: disable LBA48 devices sata_inic162x can't do LBA48 properly yet and is likely to corrupt data on drives larger than LBA28 limit. Disable LBA48 devices during device configuration. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 74cdbba42dd515887ef3fc0ab498e70bd086c075 Author: Albert Lee Date: Thu Jun 28 10:05:31 2007 +0800 libata: remove reading alt_status from ata_hsm_qc_complete() In ata_hsm_qc_complete(): Calling ata_altstatus() after the qc is completed might race with next qc. Remove it. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 8c781bf77a339748839bfd5eedfe2ad3e0e05c4a Author: Albert Lee Date: Tue Jun 26 13:43:15 2007 +0800 libata: pata_pdc2027x PLL input clock fix Recently the PLL input clock of pata_pdc2027x is sometimes detected higer than expected (e.g. 20.027 MHz compared to 16.714 MHz). It seems sometimes the mdelay() function is not as precise as it used to be. Per Alan's advice, HT or power management might affect the precision of mdelay(). This patch calls gettimeofday() to mesure the time elapsed and calculate the PLL input clock accordingly. Signed-off-by: Albert Lee Cc: Alan Cox Signed-off-by: Jeff Garzik commit abcdceb9d0bf39da7c7ff8bcdff6eb4d9dfec56f Author: Randy Dunlap Date: Mon Jun 11 11:59:34 2007 -0700 scsi disk help file is not complete On Mon, 11 Jun 2007 20:28:16 +0200 api wrote: > Good day, > When doing make menuconfig one comes across CONFIG_BLK_DEV_SD. > The help file states that this is for scsi disks.NO MENTION IS MADE THAT > IT IS NEEDE FOR SATA DISKS AS WELL! > Would have saved me a lot of time if the help was up to date. > I hope this can be changed so others can make a kernel for sata systems > quicker. From: Randy Dunlap Add help info for BLK_DEV_SD referring to its use in SATA or PATA driver configurations. Add help text for "ATA" indicating that it probably needs some SCSI config symbols enabled in order to be useful. Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 96acb6eb8effe7c2549909e2ee49f4130f2c167d Author: Dhananjay Phadke Date: Mon Jul 2 09:37:57 2007 +0530 RESEND [PATCH 3/3] NetXen: Graceful teardown of interface and hardware upon module unload Resending patch 3/3 only. These changes allow driver close routine to be called during module unload, to clean-up buffers and other software resources, flush queues etc. Also, hardware is reset to pristine state. Signed-off-by: Dhananjay Phadke Signed-off-by: Milan Bag Signed-off-by: Wen Xiong Signed-off-by: Jeff Garzik commit d14e37e12087e98b63907518dff83a90297605d6 Author: Adrian Bunk Date: Sun Jul 1 22:21:10 2007 +0200 drivers/net/ns83820.c: fix a check-after-use This patch fixes a check-after-use spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit afaee82c0aef7c2b30acff129c723031343e10c2 Author: David Brownell Date: Sun Jul 1 11:47:59 2007 -0700 net/usb/cdc_ether minor sparse cleanup Remove an "sparse" warning about a shadowed variable name. Signed-off-by: David Brownell Signed-off-by: Jeff Garzik commit 2d1a3bbdf21d05e16703c8d608628ae4676eb3ac Author: dhananjay.phadke@gmail.com Date: Mon Jul 2 00:26:00 2007 +0530 RESEND [PATCH 2/3] NetXen: Support per PCI-function interrupt mask registers This patch updates the various access routines to access different control and status settings present in different register locations. This will fix problems related to working of different ports in multi Port card. Signed-off by: Dhananjay Phadke Signed-off by: Milan Bag Signed-off-by: Jeff Garzik commit 644caeefb3bbf539e74b7098648ff0bfc9e52bb3 Author: dhananjay.phadke@gmail.com Date: Mon Jul 2 00:25:59 2007 +0530 RESEND [PATCH 1/3] NetXen: Fix issue of MSI not working correctly NetXen driver uses PCI function 0 to provide the functionality of MSI. The patch makes driver check the bus master bit for function 0 and enable it after the card initialization. Signed-off-by: Dhananjay Phadke Signed-off-by: Milan Bag Signed-off-by: Wen Xiong Signed-off-by: Jeff Garzik commit b8f59586cecdb612cd31f4d9e7904f46277ddd64 Author: Peter Korsgaard Date: Sat Jun 30 23:07:42 2007 +0200 dm9601: Return 0 from bind() on success Fixup dm9601_bind() so it returns 0 on success rather than just a positive number, as otherwise usbnet doesn't init the status handler. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 043600a62a45b2d5cac262fca9012fc24db19964 Author: Peter Korsgaard Date: Wed Jun 27 21:18:18 2007 +0200 Update MAINTAINERS for USB network devices >>>>> "Greg" == Greg KH writes: Greg> Yeah, this is the cdc_acm driver that is still in the USB drivers/ Greg> directory tree as it is a USB class driver that shows up as a tty device Greg> to userspace. It should not be moved to the networking list unless no Greg> one minds that I never see any queries about it :) Ok, here's an updated patch: Questions regarding the USB network drivers should now go to netdev. Signed-off-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Jeff Garzik commit 3e323f3e86196eec18d6959585aa3188d060c43b Author: Peter Korsgaard Date: Wed Jun 27 08:48:15 2007 +0200 usbnet: Zero padding byte if there is tail room in skb Usbnet adds a padding byte if a 0 byte USB packet would be sent. Zero padding byte if there is tail room in skb. Signed-of-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Jeff Garzik commit 23de559b8d3537f972f325e7e015c18aa2e4d987 Author: Peter Korsgaard Date: Wed Jun 27 08:14:50 2007 +0200 dm9601: HW header size shouldn't be included in packet length The dm9601 driver was including the 2 byte hardware header in the packet length, causing the HW to send 2 extra bytes of garbage on tx. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 983b7dc07f083d7d78f408a6f841b399b954767d Author: maximilian attems Date: Sun Jun 24 23:36:45 2007 +0200 starfire list alpha as 64 bit arch instead of: "This driver has not been ported to this 64-bit architecture yet." the driver is said to work on alpha, see http://bugs.debian.org/305330 Signed-off-by: maximilian attems Signed-off-by: Jeff Garzik commit b245fb675bf03d716b84dcb40885aeb50041dcca Author: Maik Hampel Date: Thu Jun 28 17:07:26 2007 +0200 myri10ge: SET_NETDEV_DEV() SET_NETDEV_DEV() in myri10ge to create the "/sys/class/net//device" symlink. Signed-off-by: Maik Hampel Signed-off-by: Jeff Garzik commit c529e632a286cd9e493398fa73e0aa1fc5a45ce5 Merge: 36f9d0c... 8da32de... Author: Jeff Garzik Date: Mon Jul 2 08:15:33 2007 -0400 Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream-fixes commit 36f9d0c5e9dc650de26b112079f46e6160a881a0 Merge: a38d618... 7dcf528... Author: Jeff Garzik Date: Mon Jul 2 08:14:30 2007 -0400 Merge branch 'libertas-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 4a3207a3339955047aab1fd5d808f8050d50dd85 Author: Mike Frysinger Date: Mon Jul 2 13:49:15 2007 +0800 Blackfin arch: update board defconfig files Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit fe77d4f283e840879f0e23b86a5d6a486823fdef Author: Stefan Richter Date: Mon Jun 25 22:18:40 2007 +0200 firewire: add Kconfig help on building both stacks Alas that won't work so good, because nobody reads help texts. I thought about adding some crude multiple choice selection (build the old stack, build the new stack, build both stacks). It's possible, but it would introduce awkward dummy config variables. Signed-off-by: Stefan Richter commit 0a9972baa7454c747fd5f67ce864420dff99d383 Author: Stefan Richter Date: Sat Jun 23 20:28:17 2007 +0200 firewire: fix async reception on big endian machines descriptor.data_address is little endian Tested-by: Olaf Hering Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 8da32de5c845b711a500f89342baf10c662e2ecb Author: Kumar Gala Date: Fri Jun 29 00:12:04 2007 -0500 gianfar: Fix typo bug introduced by move to udp_hdr() In commit 4bedb45203eab92a87b4c863fe2d0cded633427f both the udp and tcp cases where changed to use udp_hdr() instead of leaving the tcp case alone and fixing with tcp_hdr(). This ended up causing random behavior with TCP connections because of looking for tcp_hdr()->check in the wrong place. Signed-off-by: Kumar Gala commit 7dcf5284d12d7b59359a503d35797295f085f327 Author: Dan Williams Date: Mon Jun 18 12:10:33 2007 -0400 [PATCH] libertas: remove private ioctls Signed-off-by: Christoph Hellwig Acked-by: Dan Williams Signed-off-by: John W. Linville commit 18c96c3497aa871608d57ca5e08de3558159a6c9 Author: Dan Williams Date: Mon Jun 18 12:01:12 2007 -0400 [PATCH] libertas: fix WPA associations by handling ENABLE_RSN correctly Don't clobber the firmware's internal state machine by setting ENABLE_RSN more than once during the 4-way handshake. Check what the ENABLE_RSN status is and only set if it should be changed. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit f8f551089b0ca571b8f95465b6c3e1dd7bcea28e Author: Dan Williams Date: Wed May 30 10:12:55 2007 -0400 [PATCH] libertas: kill wlan_scan_process_results Fold into wlan_scan_networks() and protect with debug defines. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit b59bb616636f58ea650d2800a1dfc41c114f5ef8 Author: Dan Williams Date: Mon Jun 18 11:50:43 2007 -0400 [PATCH] libertas: style fixes Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit da1f95b4c41e09ef96869552db587452e0da46d6 Author: Robin Getz Date: Mon Jun 25 18:05:53 2007 +0800 Blackfin arch: Fix up remaining printks with proper log levels Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit de3025f4e2bc063c274f561f9daf2b696910ad3b Author: Jie Zhang Date: Mon Jun 25 18:04:12 2007 +0800 Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration Add silicon revision "any" and "none". Add proper -mcpu option according to the cpu and silicon revision configuration. Need update to use latest Blackfin cross compile toolchain. Signed-off-by: Jie Zhang Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu