commit 3a13813e6effcfad5910d47b15b724621b50b878 tree 30aaf88578ee23b0a1c0f90e7ee1100244d62415 parent 8dbc16033e35c7443cd56cb5ba308bb19cb7b469 author Stephen Hemminger Sat, 26 Aug 2006 20:28:30 -0700 committer David S. Miller Sat, 26 Aug 2006 20:28:30 -0700 [BRIDGE] netfilter: memory corruption fix The bridge-netfilter code will overwrite memory if there is not headroom in the skb to save the header. This first showed up when using Xen with sky2 driver that doesn't allocate the extra space. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8dbc16033e35c7443cd56cb5ba308bb19cb7b469 tree f849df3b657763ff401024a828e86b0b57af102c parent 81a42d298d8bd1b96be4bd459494f25fdd99b594 parent 80193aee18bc862e284ba18504f3a3e14706a997 author Linus Torvalds Sat, 26 Aug 2006 20:18:49 -0700 committer Linus Torvalds Sat, 26 Aug 2006 20:18:49 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [DCCP]: Introduce dccp_rx_hist_find_entry [DCCP]: Introduces follows48 function [DCCP]: Update contact details and copyright [DCCP]: Fix typo [IPV6]: Segmentation offload not set correctly on TCP children [CONNECTOR]: Add userspace example code into Documentation/connector/ commit 80193aee18bc862e284ba18504f3a3e14706a997 tree 84b814bc136727976c9e9503093519a93b646529 parent 837d107cd101fbf734e9ea2bbb5c7336a329e432 author Ian McDonald Sat, 26 Aug 2006 19:07:36 -0700 committer David S. Miller Sat, 26 Aug 2006 19:07:36 -0700 [DCCP]: Introduce dccp_rx_hist_find_entry This adds a new function dccp_rx_hist_find_entry. Signed off by: Ian McDonald Signed-off-by: David S. Miller commit 837d107cd101fbf734e9ea2bbb5c7336a329e432 tree 0a292efbba9272136365b62cf4d915a16ac0a130 parent e6bccd357343e98db9e1fd0d487f4f924e1a7921 author Ian McDonald Sat, 26 Aug 2006 19:06:42 -0700 committer David S. Miller Sat, 26 Aug 2006 19:06:42 -0700 [DCCP]: Introduces follows48 function This adds a new function to see if two sequence numbers follow each other. Signed off by: Ian McDonald Signed-off-by: David S. Miller commit e6bccd357343e98db9e1fd0d487f4f924e1a7921 tree 21155efb0a977e9a408b0e6013b44bacff4b1881 parent f3166c07175c1639687288006aeabed363a921f3 author Ian McDonald Sat, 26 Aug 2006 19:01:30 -0700 committer David S. Miller Sat, 26 Aug 2006 19:01:30 -0700 [DCCP]: Update contact details and copyright Just updating copyright and contacts Signed off by: Ian McDonald Signed-off-by: David S. Miller commit f3166c07175c1639687288006aeabed363a921f3 tree 248bd80dbd38dea9a0eef2925588bb34ed4111f8 parent 59eed279c5daa88d95e429782ddb8ef87e52c44b author Ian McDonald Sat, 26 Aug 2006 19:01:03 -0700 committer David S. Miller Sat, 26 Aug 2006 19:01:03 -0700 [DCCP]: Fix typo This fixes a small typo in net/dccp/libs/packet_history.c Signed off by: Ian McDonald Signed-off-by: David S. Miller commit 59eed279c5daa88d95e429782ddb8ef87e52c44b tree 89f82b76b89293aaf9eae94c9fc7be151e3ba664 parent 897522ea1c20691b6a65f32f03ae4e77e508b31c author Stephen Hemminger Fri, 25 Aug 2006 15:55:43 -0700 committer David S. Miller Sat, 26 Aug 2006 18:42:01 -0700 [IPV6]: Segmentation offload not set correctly on TCP children TCP over IPV6 would incorrectly inherit the GSO settings. This would cause kernel to send Tcp Segmentation Offload packets for IPV6 data to devices that can't handle it. It caused the sky2 driver to lock http://bugzilla.kernel.org/show_bug.cgi?id=7050 and the e1000 would generate bogus packets. I can't blame the hardware for gagging if the upper layers feed it garbage. This was a new bug in 2.6.18 introduced with GSO support. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 897522ea1c20691b6a65f32f03ae4e77e508b31c tree fe71ca8eeedc1c5aebdb4ed02d1db8222738336f parent 94918ff68a7c78fdd3241d13e18444ef80b8ff4a author Evgeniy Polyakov Fri, 25 Aug 2006 00:52:06 -0700 committer David S. Miller Sat, 26 Aug 2006 18:42:00 -0700 [CONNECTOR]: Add userspace example code into Documentation/connector/ I was asked several times to include userspace example code into Documentation, so if there is no policy against it, consider attached patch for 2.6.18. This program works with included Documentation/connector/cn_test.c connector module. Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit 81a42d298d8bd1b96be4bd459494f25fdd99b594 tree 7b562fabab424bcb68812da1175f0a78cd413ca0 parent 5fec811e99bb6f537e67b6bcbe9fe6505aa8a114 author Jeff Mahoney Fri, 25 Aug 2006 15:58:57 -0700 committer David S. Miller Sat, 26 Aug 2006 17:55:55 -0700 [DISKLABEL] SUN: Fix signed int usage for sector count The current sun disklabel code uses a signed int for the sector count. When partitions larger than 1 TB are used, the cast to a sector_t causes the partition sizes to be invalid: # cat /proc/paritions | grep sdan 66 112 2146435072 sdan 66 115 9223372036853660736 sdan3 66 120 9223372036853660736 sdan8 This patch switches the sector count to an unsigned int to fix this. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5fec811e99bb6f537e67b6bcbe9fe6505aa8a114 tree 9c4dcefe198ef7df3283518d3cc1629857aa7604 parent a23b423ec0573ead85e2c92f2a5df5d4bf47e26b author Krzysztof Helt Fri, 25 Aug 2006 16:22:21 -0700 committer David S. Miller Sat, 26 Aug 2006 17:52:56 -0700 [SPARC]: Small smp cleanup. It moves the smp_procesors_ready variable to sun4d_smp.c only. Signed-off-by: Krzysztof Helt (krzysztof.h1@wp.pl) Signed-off-by: David S. Miller commit a23b423ec0573ead85e2c92f2a5df5d4bf47e26b tree d25bb838298a97ed74930ce85ad8c65566817b85 parent 94918ff68a7c78fdd3241d13e18444ef80b8ff4a author Krzysztof Helt Fri, 25 Aug 2006 00:46:02 -0700 committer David S. Miller Sat, 26 Aug 2006 17:52:51 -0700 [SPARC]: enabling of the 2nd CPU in 2.6.18-rc4 smp_setup_cpu_possible_map() needs to run after paging_init() so that the in-kernel device tree is setup. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 94918ff68a7c78fdd3241d13e18444ef80b8ff4a tree 740220a5cd8a9e6e8f2957b4b10afca3d8c016ac parent be729523369ec7825bde4a0e774ee7932e9d3dff author Alan Stern Mon, 14 Aug 2006 11:40:46 -0400 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:06:24 -0700 [PATCH] unusual_devs update for UCR-61S2B The existing unusual_devs entry for the UCR-61S2B appears to have too wide a revision range. It matches at least one device that doesn't respond to the initialization sequence. Perhaps the sequence needs to be updated, or perhaps something else can be done. For now, this patch (as764) restricts the range to include only the revision mentioned in the original comment. This resolves (for now!) Bugzilla entry #6950. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit be729523369ec7825bde4a0e774ee7932e9d3dff tree 736ab807f33c7c90089655dbbf86c6d8fcd3096e parent b93b58eea81beacac55770dd39e34fbffdc36000 author Tomasz Kazmierczak Fri, 18 Aug 2006 23:43:29 +0200 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:06:17 -0700 [PATCH] USB: pl2303: removed support for OTi's DKU-5 clone cable This patch removes support for a clone of Nokia DKU-5 cable made by Ours Technology Inc, as it turned out that the cable does not use the pl2303 chip, but OTI-6858 chip which is not compatible with the pl2303. Signed-off-by: Tomasz Kazmierczak Signed-off-by: Greg Kroah-Hartman commit b93b58eea81beacac55770dd39e34fbffdc36000 tree 39cdedf90344a07ca815692f0c0d1b9316850dd8 parent 39ba487fe22a63b3df7c543c82d01db0f0fed700 author Greg Kroah-Hartman Mon, 14 Aug 2006 17:32:51 -0700 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:06:11 -0700 [PATCH] USB: fix bug in cypress_cy7c63.c driver This was pointed out by Adrian Bunk , as found by the Coverity Checker. Cc: Adrian Bunk Cc: Oliver Bock Signed-off-by: Greg Kroah-Hartman commit 39ba487fe22a63b3df7c543c82d01db0f0fed700 tree 13431f83dd7b0f8ccba5121c5fa7707c006a102b parent cc702c2c5e5ab51e1b0d3386d447e7b1772879ee author Henrik Kretzschmar Tue, 15 Aug 2006 10:57:16 +0200 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:05:59 -0700 [PATCH] PCI: kerneldoc correction in pci-driver Removes an unused kerneldoc entry from pci_match_device and put the others into correct order. Signed-off-by: Henrik Kretzschmar Signed-off-by: Greg Kroah-Hartman commit cc702c2c5e5ab51e1b0d3386d447e7b1772879ee tree 925c4fb498a8798ff548a840b19d00f9d84abd4a parent 65ae4dddbb56c7415c31e9aae0b3811cb583bbea author Scott Murray Tue, 22 Aug 2006 19:55:57 -0400 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:05:52 -0700 [PATCH] CPCI hotplug: fix resource assignment Here is a patch against the CPCI hotplug core to fix up PCI resource assignment such that things will actually work when a hot inserted device is enabled. I mentioned this patch to you way back in April at ELC, but am only now out from under things enough to clean it up and submit it. I've basically cribbed the corresponding code from shpchp_pci.c, so there are no big surprises. If it's still possible, I wouldn't mind this going into 2.6.18, but it wouldn't be the end of the world if it went into 2.6.19. Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit 65ae4dddbb56c7415c31e9aae0b3811cb583bbea tree 86a3a3c30fa8ea45538458cc907e9979a1b2e13e parent fd4dc27cff15f77cde218613baa36b855c85ad9f author Daniel Ritz Tue, 22 Aug 2006 07:29:10 -0700 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:05:45 -0700 [PATCH] PCI: fix ICH6 quirks - add the ICH6(R) LPC to the ICH6 ACPI quirks. currently only the ICH6-M is handled. [ PCI_DEVICE_ID_INTEL_ICH6_1 is the ICH6-M LPC, ICH6_0 is the ICH6(R) ] - remove the wrong quirk calling asus_hides_smbus_lpc() for ICH6. the register modified in asus_hides_smbus_lpc() has a different meaning in ICH6. Signed-off-by: Daniel Ritz Acked-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit fd4dc27cff15f77cde218613baa36b855c85ad9f tree dd506494b50fe757036422420d2972b2466c7c0f parent 954c0b7cd5b9aaa11fb67a0c011fcb5e5897385a author Daniel Ritz Tue, 22 Aug 2006 07:29:09 -0700 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:05:37 -0700 [PATCH] PCI: i386 mmconfig: don't forget bus number when setting fallback_slots bits On i386 PCI mmconfig forgets the bus number when setting the fallback_slots bits which means fallback to conf1 only works for bus 0. Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 954c0b7cd5b9aaa11fb67a0c011fcb5e5897385a tree 09c8eed0e42c3b28d8b0ffc58d86f906f4093658 parent faf9b616325430422fa13fead88ca7843eb249d6 author Daniel Ritz Tue, 22 Aug 2006 07:29:08 -0700 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:05:31 -0700 [PATCH] PCI: use PCBIOS as last fallback there was a change in 2.6.17 which affected the order in which the PCI access methods are probed. this gives regressions on some machines with broken BIOS. the problem is that PCBIOS sometimes reports last bus wrong, leaving cardbus non-funcational. previously those system worked fine with direct access. The patch changes the PCI init code to have PCBIOS as last fallback, yet the PCBIOS code still has to run first to set pcibios_last_bus to the value reported by the BIOS. this is needed in case legacy PCI probing (arch/i386/pci/legacy.c) is used to detect peer busses. using direct access if available fixes the cardbus problems. Signed-off-by: Daniel Ritz Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit faf9b616325430422fa13fead88ca7843eb249d6 tree 7272b6ac857c5ec400ea61a65f141927de3712af parent 4801bc25f37a969ea773c24d12fd4738541848a1 author Hans de Goede Fri, 25 Aug 2006 10:24:20 +0200 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:05:19 -0700 [PATCH] hwmon: abituguru timeout fixes This patch contains 2 sets of fixes for the abituguru: 1) Much improved timeout handling, drasticly reducing the amount of timeout errors on some motherboards 2) Fix the exit paths in the bank1 sensor type detect code to always restore the original settings even on an error. Without this our special test settings could remain seriously confusing the system BIOS's setup menu. Both are very much related and are must haves, to avoid messing up the uguru CMOS settings. Detailed changes: - Much improved timeout / wait for status handling. Many thanks to Sunil Kumar, for all his testing, ideas and patches! The code now first busy waits, polling the uguru for the expected status as this usually succeeds pretty quickly (within 90 reads). To avoid unnecessary CPU burn in timeout conditions, the amount of busy waiting has been halved from previous versions (120 tries instead of 250). This is not a problem, because this version goes to sleep after 120 attemps for 1 jiffy and then tries again, it does this sleep and try again 5 times before finally giving up. This (almost?) completly removes the timeout errors some people have seen regulary. Apparently some older uguru versions sometimes are distracted for a (relatively) long time. This solves this. - These timeout errors not only occur in the sending address part of reading the uguru but also in the wait for read state, so errors in this state are now handled as retryable just like send address state errors and are only logged and reported to userspace if 3 executive tries fail. - Fix a very nasty bug in the bank1 sensor type detection code, where it would not restore the original settings in any of the error paths! - Since not successfully restoring the original settings can seriously confuse the system BIOS (hang when entering the relevant setup menu), we now try restoring them 3 times before giving up. Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4801bc25f37a969ea773c24d12fd4738541848a1 tree 95e9c36770d255dbf5f78515abda64ca91d0a1f3 parent f834c755423332a6ff4397fae754029a6a7a8249 author David Brownell Fri, 11 Aug 2006 22:53:08 +0200 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:05:12 -0700 [PATCH] i2c: tps65010 build fixes The tps65010.c driver in the main tree never got updated with build fixes since the last batch of I2C driver changes; and the genirq trigger flags were updated wierdly too. This also includes a minor tweak to reduce the frequency used to poll for unplug-the-AC-power on the TPS chips that don't provide relevant IRQs. It _would_ be nice to sense whether there's even a battery, but that'd normally be an HDQ/1-wire interface to a smart battery, and such APIs aren't standardized. Signed-off-by: David Brownell Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f834c755423332a6ff4397fae754029a6a7a8249 tree 004266b9612a69484a5dc0dc3d6db0d1e5ab60d5 parent 62250b3bb596ffbae17c4b3d865fecd6329ce8b3 parent 0db99e3359234be181590463184b9959059a9ea9 author Greg Kroah-Hartman Sat, 26 Aug 2006 13:04:23 -0700 committer Greg Kroah-Hartman Sat, 26 Aug 2006 13:04:23 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 commit 0db99e3359234be181590463184b9959059a9ea9 tree 3822a0e4c6408cd0f0d23211f7f969dae873b483 parent 15a3758dc9e1c9d862e46acdf607de70c302fa6a author Mike Christie Sat, 26 Aug 2006 03:00:22 -0400 committer James Bottomley Sat, 26 Aug 2006 10:03:14 -0500 [SCSI] fix scsi_send_eh_cmnd regression The callers of scsi_send_eh_cmnd are setting the cmnd buffer, and then scsi_send_eh_cmnd is copying that updated buffer to the old_cmnd variable. Then after the command runs, we end up copying that old_cmnd var which has the new cmnd to the scsi command buffer. When this command gets recent, all types of fun things happen like getting TUR or START_STOP commands with data and scatterlists. This patch made against scsi-rc-fixes, has the callers of scsi_send_eh_cmnd pass in the command so scsi_send_eh_cmnd can do the right thing. This should go into 2.6.18 since this fixes a regression added when we removed some of the scsi_cmnd fields and replaced them with local variables. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 15a3758dc9e1c9d862e46acdf607de70c302fa6a tree af0ae6bc2158682350961ee097af4b08f280af63 parent 476e8978d9ccacfc911bd42e083dd784ad1465b1 author Andrew Vasquez Wed, 23 Aug 2006 14:54:56 -0700 committer James Bottomley Sat, 26 Aug 2006 09:26:57 -0500 [SCSI] qla2xxx: Update version number to 8.01.07-k1. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 476e8978d9ccacfc911bd42e083dd784ad1465b1 tree 419fe17bfbffccd5e777b17d357c6d1324038d1d parent 9c06938aa458843fb71fa35371f23a3b89317252 author Andrew Vasquez Wed, 23 Aug 2006 14:54:55 -0700 committer James Bottomley Sat, 26 Aug 2006 09:26:41 -0500 [SCSI] qla2xxx: Properly re-enable EFT support after an ISP abort. Software must explicitely re-enable extended firmware tracing after any ISP abort condition. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 9c06938aa458843fb71fa35371f23a3b89317252 tree 1734579259d73df860207c1e66c5404011e127cf parent b2155d0417df9f2b4c0d396b6530b864d9f08623 author Andrew Vasquez Wed, 23 Aug 2006 14:54:54 -0700 committer James Bottomley Sat, 26 Aug 2006 09:26:27 -0500 [SCSI] qla2xxx: Correct PLOGI retry logic. Original code attempts to retry PLOGIs to fcports that are FCP_TARGETs only. If the driver never performed a successful PLOGI/PRLI, the port-type would never be assigned, and the relogin logic would silently drop the request (and thus the port would not be recognized and registered). The fix is relatively straightforward, drop the FCP_TARGET-only check. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit b2155d0417df9f2b4c0d396b6530b864d9f08623 tree 3e7683501f150b6eff19226da139cbd5f69d3b78 parent 48e2691f9c3bd6719e773f0b883449f4cef39585 author Douglas Gilbert Sat, 19 Aug 2006 00:11:34 -0400 committer James Bottomley Sat, 26 Aug 2006 09:25:06 -0500 [SCSI] sg: fix incorrect page problem There's a problem where sg is executing a ->nopage operation on a compound page, it actually calls get_page() on the first page in the compound rather than the page which is being mapped. The fix is to select the correct page by indexing into the compound. Signed-off-by: James Bottomley commit 62250b3bb596ffbae17c4b3d865fecd6329ce8b3 tree 8f18da918c319a1f0be6c4011b60091bb29dc007 parent 428a7e3e46a465a6cfe7ccbe15d7ea03a043a95a parent a969fd5a4e162c4485ae8f3e49d674656a18fa36 author Greg Kroah-Hartman Thu, 24 Aug 2006 22:29:46 -0700 committer Greg Kroah-Hartman Thu, 24 Aug 2006 22:29:46 -0700 Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6 commit a969fd5a4e162c4485ae8f3e49d674656a18fa36 tree b0b61e40b0bda116e41f2a451666715caed2c263 parent 9167b0b9a0ab7907191523f5a0528e3b9c288e21 author Trond Myklebust Tue, 22 Aug 2006 20:06:04 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:55:16 -0400 VFS: Remove redundant open-coded mode bit checks in open_exec(). The check in open_exec() for inode->i_mode & 0111 has been made redundant by the fix to permission(). Signed-off-by: Trond Myklebust (cherry picked from 1d3741c5d991686699f100b65b9956f7ee7ae0ae commit) commit 9167b0b9a0ab7907191523f5a0528e3b9c288e21 tree 63345d9bacaf1b30e977a5cd24322d2426f6109f parent a343bb7750e6a098909c34f5c5dfddbc4fa40053 author Trond Myklebust Tue, 22 Aug 2006 20:06:03 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:55:06 -0400 VFS: Remove redundant open-coded mode bit check in prepare_binfmt(). The check in prepare_binfmt() for inode->i_mode & 0111 is redundant, since open_exec() will already have done that. Signed-off-by: Trond Myklebust (cherry picked from 822dec482ced07af32c378cd936d77345786572b commit) commit a343bb7750e6a098909c34f5c5dfddbc4fa40053 tree f4125368b85270b4fd619ae317ce0796605c579e parent 16b4289c7460ba9c04af40c574949dcca9029658 author Trond Myklebust Tue, 22 Aug 2006 20:06:03 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:54:58 -0400 VFS: Fix access("file", X_OK) in the presence of ACLs Currently, the access() call will return incorrect information on NFS if there exists an ACL that grants execute access to the user on a regular file. The reason the information is incorrect is that the VFS overrides this execute access in open_exec() by checking (inode->i_mode & 0111). This patch propagates the VFS execute bit check back into the generic permission() call. Signed-off-by: Trond Myklebust (cherry picked from 64cbae98848c4c99851cb0a405f0b4982cd76c1e commit) commit 16b4289c7460ba9c04af40c574949dcca9029658 tree b0c1b47e82306d23e326d6a6a59d251eccb85e81 parent e8896495bca8490a427409e0886d63d05419ec65 author Trond Myklebust Thu, 24 Aug 2006 12:27:15 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:54:13 -0400 NFSv4: Add v4 exception handling for the ACL functions. This is needed in order to handle any NFS4ERR_DELAY errors that might be returned by the server. It also ensures that we map the NFSv4 errors before they are returned to userland. Signed-off-by: Trond Myklebust (cherry picked from 71c12b3f0abc7501f6ed231a6d17bc9c05a238dc commit) commit e8896495bca8490a427409e0886d63d05419ec65 tree b402c7c7a868501e3c6dbcf1874ead3368152ea4 parent 3cedf13af9f7e61aca0dbbd11b601ac93bf93a9f author David Howells Thu, 24 Aug 2006 15:44:19 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:53:34 -0400 NFS: Check lengths more thoroughly in NFS4 readdir XDR decode Check the bounds of length specifiers more thoroughly in the XDR decoding of NFS4 readdir reply data. Currently, if the server returns a bitmap or attr length that causes the current decode point pointer to wrap, this could go undetected (consider a small "negative" length on a 32-bit machine). Also add a check into the main XDR decode handler to make sure that the amount of data is a multiple of four bytes (as specified by RFC-1014). This makes sure that we can do u32* pointer subtraction in the NFS client without risking an undefined result (the result is undefined if the pointers are not correctly aligned with respect to one another). Signed-Off-By: David Howells Signed-off-by: Trond Myklebust (cherry picked from 5861fddd64a7eaf7e8b1a9997455a24e7f688092 commit) commit 3cedf13af9f7e61aca0dbbd11b601ac93bf93a9f tree 4755f3f0de0439ba83b32b6a238064a58a751f64 parent 8e037094c414172481c5ce903efdab50ce932343 author J. Bruce Fields Thu, 24 Aug 2006 15:44:12 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:51:59 -0400 NFSv4: increase client-provided nfs4 clientid size Neil Brown observed that the current limit of 32 bytes isn't enough to hold two ip addresses and the rest of the stuff we're putting in it, so it's often truncated to the point where it's unlikely to be unique. This can cause spurious CLID_INUSE's from the server. Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust (cherry picked from fc8c17ec251e984ab3df9182ed097aa5b577c915 commit) commit 8e037094c414172481c5ce903efdab50ce932343 tree 31e97632e2b0ac49c30cdc5c2138b92ddceec227 parent 79558f3610efd7928e8882b2eaca3093b283630e author Chuck Lever Tue, 22 Aug 2006 20:06:15 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:51:32 -0400 SUNRPC: avoid choosing an IPMI port for RPC traffic Some hardware uses port 664 for its hardware-based IPMI listener. Teach the RPC client to avoid using that port by raising the default minimum port number to 665. Test plan: Find a mainboard known to use port 664 for IPMI; enable IPMI; mount NFS servers in a tight loop. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust (cherry picked from 58e8cb3a035d22fc386e1c53a5d98c3f219530fb commit) commit 79558f3610efd7928e8882b2eaca3093b283630e tree 125f16640cd7f9de2074dae89a9c6c405703029c parent 01df9c5e918ae5559f2d96da0143f8bfbb9e6171 author Trond Myklebust Tue, 22 Aug 2006 13:44:32 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:51:08 -0400 NFS: Fix issue with EIO on NFS read The problem is that we may be caching writes that would extend the file and create a hole in the region that we are reading. In this case, we need to detect the eof from the server, ensure that we zero out the pages that are part of the hole and mark them as up to date. Signed-off-by: Trond Myklebust (cherry picked from 856b603b01b99146918c093969b6cb1b1b0f1c01 commit) commit 01df9c5e918ae5559f2d96da0143f8bfbb9e6171 tree 1716c3caf8c5d6c10aa139bdbb75d93af30fc0b2 parent 8f8e7a50f450fcb86a5b2ffb94543c57a14f8260 author Trond Myklebust Thu, 10 Aug 2006 11:58:57 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:51:00 -0400 LOCKD: Fix a deadlock in nlm_traverse_files() nlm_traverse_files() is not allowed to hold the nlm_file_mutex while calling nlm_inspect file, since it may end up calling nlm_release_file() when releaseing the blocks. Signed-off-by: Trond Myklebust (cherry picked from e558d3cde986e04f68afe8c790ad68ef4b94587a commit) commit 8f8e7a50f450fcb86a5b2ffb94543c57a14f8260 tree fc48bee347dad1c6100468c2169d34152e2daac1 parent 68adb0af51ebccb72ffb14d49cb8121b1afc4259 author Trond Myklebust Mon, 14 Aug 2006 13:11:15 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:50:51 -0400 SUNRPC: Fix dentry refcounting issues with users of rpc_pipefs rpc_unlink() and rpc_rmdir() will dput the dentry reference for you. Signed-off-by: Trond Myklebust (cherry picked from a05a57effa71a1f67ccbfc52335c10c8b85f3f6a commit) commit 68adb0af51ebccb72ffb14d49cb8121b1afc4259 tree cfe18744aa4a96680cf344092cff9a741fe152c3 parent dff02cc1a34fcb60904a2c57cb351857cc11219e author Trond Myklebust Thu, 10 Aug 2006 17:51:46 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:50:42 -0400 SUNRPC: rpc_unlink() must check for unhashed dentries A prior call to rpc_depopulate() by rpc_rmdir() on the parent directory may have already called simple_unlink() on this entry. Add the same check to rpc_rmdir(). Also remove a redundant call to rpc_close_pipes() in rpc_rmdir. Signed-off-by: Trond Myklebust (cherry picked from 0bbfb9d20f6437c4031aa3bf9b4d311a053e58e3 commit) commit dff02cc1a34fcb60904a2c57cb351857cc11219e tree e15957078e7f03f8b2b758cee0f7362d42f83c80 parent 5d67476fff2df6ff12f60b540fd0e74cf2a668f9 author Trond Myklebust Mon, 31 Jul 2006 14:17:18 -0700 committer Trond Myklebust Thu, 24 Aug 2006 15:50:32 -0400 NFS: clean up rpc_rmdir Make it take a dentry argument instead of a path Signed-off-by: Trond Myklebust (cherry picked from 648d4116eb2509f010f7f34704a650150309b3e7 commit) commit 5d67476fff2df6ff12f60b540fd0e74cf2a668f9 tree d1428c5562ce6b24919da18c44746d363e9864e1 parent a634904a7de0d3a0bc606f608007a34e8c05bfee author Trond Myklebust Mon, 31 Jul 2006 14:11:48 -0700 committer Trond Myklebust Thu, 24 Aug 2006 15:50:07 -0400 SUNRPC: make rpc_unlink() take a dentry argument instead of a path Signe-off-by: Trond Myklebust (cherry picked from 88bf6d811b01a4be7fd507d18bf5f1c527989089 commit) commit a634904a7de0d3a0bc606f608007a34e8c05bfee tree 936d436adb118f7e7fbadd6eabf5296693861df0 parent ddeff520f02b92128132c282c350fa72afffb84a author ASANO Masahiro Tue, 22 Aug 2006 20:06:02 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:49:14 -0400 VFS: add lookup hint for network file systems I'm trying to speeding up mkdir(2) for network file systems. A typical mkdir(2) calls two inode_operations: lookup and mkdir. The lookup operation would fail with ENOENT in common case. I think it is unnecessary because the subsequent mkdir operation can check it. In case of creat(2), lookup operation is called with the LOOKUP_CREATE flag, so individual filesystem can omit real lookup. e.g. nfs_lookup(). Here is a sample patch which uses LOOKUP_CREATE and O_EXCL on mkdir, symlink and mknod. This uses the gadget for creat(2). And here is the result of a benchmark on NFSv3. mkdir(2) 10,000 times: original 50.5 sec patched 29.0 sec Signed-off-by: ASANO Masahiro Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust (cherry picked from fab7bf44449b29f9d5572a5dd8adcf7c91d5bf0f commit) commit ddeff520f02b92128132c282c350fa72afffb84a tree 238a720ece47a2f1e07b4d4cc53dff10860bbacb parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046 author Nikita Danilov Wed, 09 Aug 2006 13:53:47 -0400 committer Trond Myklebust Thu, 24 Aug 2006 15:48:46 -0400 NFS: Fix a potential deadlock in nfs_release_page nfs_wb_page() waits on request completion and, as a result, is not safe to be called from nfs_release_page() invoked by VM scanner as part of GFP_NOFS allocation. Fix possible deadlock by analyzing gfp mask and refusing to release page if __GFP_FS is not set. Signed-off-by: Nikita Danilov Signed-off-by: Trond Myklebust (cherry picked from 374d969debfb290bafcb41d28918dc6f7e43ce31 commit) commit 428a7e3e46a465a6cfe7ccbe15d7ea03a043a95a tree 5a2d93ea5e027c5d6431a9af3b20eb51fbb6fb53 parent 7bf13484d256e21b4bceb07026ac68dbae9dcce5 parent 8e79a441a4d8a34d64efe93add49b3eefca5cd1c author Greg Kroah-Hartman Thu, 24 Aug 2006 10:54:22 -0700 committer Greg Kroah-Hartman Thu, 24 Aug 2006 10:54:22 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 commit 8e79a441a4d8a34d64efe93add49b3eefca5cd1c tree 85f163962161f8c26881533a5376602f8f800e9d parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046 author Horst Hummel Thu, 24 Aug 2006 13:22:36 +0200 committer Martin Schwidefsky Thu, 24 Aug 2006 13:22:36 +0200 [S390] dasd PAV enabling. The subsystem check in the PAV code is incorrect, it enables PAV per device instead of per subsystem. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 7bf13484d256e21b4bceb07026ac68dbae9dcce5 tree 37e76952178ff06eb9d2dc0314be4250ba1cd85b parent 20253de9d566f02b82aa1e0c103f73e80619106a parent ac2164d5e425fa4755bdbab9641d8dab7239b6f5 author Greg Kroah-Hartman Thu, 24 Aug 2006 01:28:14 -0700 committer Greg Kroah-Hartman Thu, 24 Aug 2006 01:28:14 -0700 Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit ac2164d5e425fa4755bdbab9641d8dab7239b6f5 tree 4576ca4b573e7c7bcb197f934ef3da35c2457d0c parent 9dd9c16465c82d1385f97d2a245641464fcb7894 author Tejun Heo Wed, 23 Aug 2006 01:00:27 +0900 committer Jeff Garzik Thu, 24 Aug 2006 02:51:24 -0400 [PATCH] sata_via: use old SCR access pattern on vt6420 vt6420 has super-fragile SCR registers which can hang the whole machine if accessed with the wrong timings. This patch makes sata_via use SCR registers only during probing and with the same timings as before (pre new EH), which is proven to work. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9dd9c16465c82d1385f97d2a245641464fcb7894 tree 0f729bb81af48ff79bda7eea0d366c87aed80a10 parent f3745a3f9fa39fa3c62f7d5b8549ee787d2c6848 author Tejun Heo Tue, 22 Aug 2006 21:15:58 +0900 committer Jeff Garzik Thu, 24 Aug 2006 02:51:24 -0400 [PATCH] ata_piix: implement force_pcs module parameter This patch implements force_pcs module parameter for ata_piix. If 1, PCS is ignored, 2 honored. As there seem to be quite a few ICHs w/ impaired PCS, this option will be useful for cases where the default setting doesn't work. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f3745a3f9fa39fa3c62f7d5b8549ee787d2c6848 tree 03bf0b2abfd9389dbadb69f024aa2761c28b9a5f parent f1a58ecae527fc67c87ce4dcb9e73894f64aadfe author Tejun Heo Tue, 22 Aug 2006 21:06:46 +0900 committer Jeff Garzik Thu, 24 Aug 2006 02:51:24 -0400 [PATCH] ata_piix: ignore PCS on ICH5 There have been a number of reports regarding some ICH5s failing to detect devices since the PCS handling update. Analysis shows that these problems are caused by bogus PCS values from those controllers. Before the PCS update, the driver didn't honor PCS regs exactly and probed them in many cases PCS reports no device. Now that PCS is honored exactly, these hardware problems are visible. This patch makes ICH5 ignore PCS. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 20253de9d566f02b82aa1e0c103f73e80619106a tree a91db957a3dd40469531f35a920b8302c03fb7ee parent b7277155f8fa89cd5696140b4a93cfb53d0091ff parent 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 author Greg Kroah-Hartman Wed, 23 Aug 2006 21:58:48 -0700 committer Greg Kroah-Hartman Wed, 23 Aug 2006 21:58:48 -0700 Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 tree 0ba358be2a3a9a62f722838adea7fff8a1f946ff parent c5ab964debe92d0ec7af330f350a3433c1b5b61e parent 9b5cce07648d059a013444116bd0140b047b25a1 author Jeff Garzik Thu, 24 Aug 2006 00:41:25 -0400 committer Jeff Garzik Thu, 24 Aug 2006 00:41:25 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit c5ab964debe92d0ec7af330f350a3433c1b5b61e tree a9d3c4b97efe1e0b1854ba4c7130905d786f95c8 parent 8d91626636ed9ce8b742edb52ae48f2faefd5864 author Richard Purdie Tue, 22 Aug 2006 18:55:44 +0100 committer Jeff Garzik Thu, 24 Aug 2006 00:40:51 -0400 [PATCH] spectrum_cs: Fix firmware uploading errors spectrum_cs: Fix the logic so we error when the device is *not* present! This fixes firmware upload failures which prevent the driver from working (the bug is also present in 2.6.17). Signed-off-by: Richard Purdie Signed-off-by: Jeff Garzik commit 8d91626636ed9ce8b742edb52ae48f2faefd5864 tree d6270c4b398f356081b4f078cf32e21bafd23f7e parent 9a469abe9c6bab3ce237ee433541931bbd827faf author Don Fry Tue, 22 Aug 2006 10:22:37 -0700 committer Jeff Garzik Thu, 24 Aug 2006 00:40:03 -0400 [PATCH] pcnet32: break in 2.6.18-rc1 identified A change I made for 2.6.17 and another for 2.6.18 do not work on older pcnet32 chips which I do not have access to. If the chip is a 79C970 or 79C965, do not try and suspend or check the link status. I have tested with a 79C970A, 79C971, 79C972, 79C973, 79C975, 79C976, and 79C978. Signed-off-by: Don Fry Signed-off-by: Jeff Garzik commit 9a469abe9c6bab3ce237ee433541931bbd827faf tree b1f3634a602b612fbbf62254f80c7c2c72a4540f parent cb958186ed543d1a4f074ceb1c783fe8b0908437 author Joerg Ahrens Sun, 20 Aug 2006 21:51:57 +0100 committer Jeff Garzik Thu, 24 Aug 2006 00:38:32 -0400 [PATCH] xirc2ps_cs: Cannot reset card in atomic context I am using a Xircom CEM33 pcmcia NIC which has occasional hardware problems. If the netdev watchdog detects a transmit timeout, do_reset is called which msleeps - this is illegal in atomic context. This patch schedules the timeout handling as a workqueue item. Signed-off-by: Daniel Drake Signed-off-by: Jeff Garzik commit cb958186ed543d1a4f074ceb1c783fe8b0908437 tree 852a5b70ff626b7b9dbf1c1e6da5a65b55cb40c7 parent a76b044af147135b5fb7570aba35d4908f143cc9 author Eric Sesterhenn Sat, 19 Aug 2006 19:37:57 +0200 committer Jeff Garzik Thu, 24 Aug 2006 00:37:04 -0400 [PATCH] Signedness issue in drivers/net/3c515.c while playing with gcc 4.1 -Wextra warnings, I came across this one: drivers/net/3c515.c:1027: warning: comparison of unsigned expression >= 0 is always true Since i is unsigned the >= 0 check in the for loop is always true, so we might spin there forever unless the if condition triggers. Since i is only used in this loop, this patch changes it to an integer. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit b7277155f8fa89cd5696140b4a93cfb53d0091ff tree c75cb996b2942d15e3a5d4327e9c582336880292 parent ccc712fe6b2acbafe9fc31f765a193e3249ca4a1 parent c712a9de94a5df5bc0087c14ad0b1aac2c147991 author Greg Kroah-Hartman Wed, 23 Aug 2006 21:11:56 -0700 committer Greg Kroah-Hartman Wed, 23 Aug 2006 21:11:56 -0700 Merge branch 'for-linus' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/dtor/input commit ccc712fe6b2acbafe9fc31f765a193e3249ca4a1 tree 9e1a4052a69203baf1e866af4536ca9ceb904fa6 parent 9c637646dafd82370c284ce7fcc8b4ba2546dfb1 parent c9169f8747bb282cbe518132bf7d49755a00b6c1 author Greg Kroah-Hartman Wed, 23 Aug 2006 21:08:12 -0700 committer Greg Kroah-Hartman Wed, 23 Aug 2006 21:08:12 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc commit 9c637646dafd82370c284ce7fcc8b4ba2546dfb1 tree a9070311c7b1963013fe25b4b458f48b21501685 parent b8b99e857d0e258b0da17e55466e5142465d35fd parent 834ac73d4bc804db8ccb3f2a517e36db5f6bc4bd author Greg Kroah-Hartman Wed, 23 Aug 2006 18:08:44 -0700 committer Greg Kroah-Hartman Wed, 23 Aug 2006 18:08:44 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband commit c9169f8747bb282cbe518132bf7d49755a00b6c1 tree 1357eb203b7e3c80d6ea2036df664e1a3a401555 parent d55c4a76f26160482158cd43788dcfc96a320a4f author Adam Litke Fri, 18 Aug 2006 11:22:21 -0700 committer Paul Mackerras Thu, 24 Aug 2006 10:07:23 +1000 [POWERPC] hugepage BUG fix On Tue, 2006-08-15 at 08:22 -0700, Dave Hansen wrote: > kernel BUG in cache_free_debugcheck at mm/slab.c:2748! Alright, this one is only triggered when slab debugging is enabled. The slabs are assumed to be aligned on a HUGEPTE_TABLE_SIZE boundary. The free path makes use of this assumption and uses the lowest nibble to pass around an index into an array of kmem_cache pointers. With slab debugging turned on, the slab is still aligned, but the "working" object pointer is not. This would break the assumption above that a full nibble is available for the PGF_CACHENUM_MASK. The following patch reduces PGF_CACHENUM_MASK to cover only the two least significant bits, which is enough to cover the current number of 4 pgtable cache types. Then use this constant to mask out the appropriate part of the huge pte pointer. Signed-off-by: Adam Litke Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit b8b99e857d0e258b0da17e55466e5142465d35fd tree 7cae85965f21792664506e9f85f2a983ee0ee53d parent 0f4184f73d5233214d3225a94fcf1bd4d6678d74 author David S. Miller Wed, 23 Aug 2006 15:53:39 -0700 committer David S. Miller Wed, 23 Aug 2006 15:53:39 -0700 [SERIAL] sunzilog: Mirror the sunsab serial setup bug fix. Signed-off-by: David S. Miller commit 0f4184f73d5233214d3225a94fcf1bd4d6678d74 tree 0aca57fc40523377916f0836506646205a0677eb parent 25848c4e502ec2bb94ee1f3c82709311059d0857 author Marc Zyngier Wed, 23 Aug 2006 15:50:57 -0700 committer David S. Miller Wed, 23 Aug 2006 15:50:57 -0700 [SERIAL] sunsab: Fix E250 console with RSC. This fixes yet another sunsab problem, when console is set to anything but the first port. The console framework calls sunsab_console_setup for each port, and we end up setting up a console on a not yet discovered port, which leads to an Oops. Instead, defer console setup until the requested port is properly initialized. Tested on an E250 through an RSC console. Reported by Daniel Smolik Signed-off-by: Marc Zyngier Signed-off-by: David S. Miller commit 25848c4e502ec2bb94ee1f3c82709311059d0857 tree 68d7f2033ea0a868cbd994b06228f418da76fc95 parent 1bad998a2778055c095b4f2081c68e6bc82f06e2 author David S. Miller Wed, 23 Aug 2006 15:33:07 -0700 committer David S. Miller Wed, 23 Aug 2006 15:33:07 -0700 [SCSI] esp: Fix build on SUN4. Noted by Alexey Dobriyan. Signed-off-by: David S. Miller commit 834ac73d4bc804db8ccb3f2a517e36db5f6bc4bd tree 64af4566e720bf878fb8d74944ff4b12dd9a309b parent 5beba53230351b2d77c317c22e66c415f2ebaf02 author Michael S. Tsirkin Tue, 22 Aug 2006 22:45:06 +0300 committer Roland Dreier Wed, 23 Aug 2006 13:29:08 -0700 IB/mthca: Update HCA firmware revisions Update the driver's list of HCA firmware revisions to make sure people running Sinai firmware older than 1.1.0 get a message suggesting a firmware upgrade. Update the Arbel versions as well while we are at it. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 9b5cce07648d059a013444116bd0140b047b25a1 tree 7c8abb693dc50f81b442b5f459350b2e0f996f86 parent 794ccda61c7dc2aa6c66e8ef18a44d865d3c3a7d author Pavel Roskin Tue, 15 Aug 2006 21:41:39 -0400 committer John W. Linville Wed, 23 Aug 2006 14:20:37 -0400 [PATCH] hostap: Restore antenna selection settings after port reset Intersil firmware 1.7.4 (and possibly others) loses the antenna selection settings when the port is reset. Signed-off-by: David Acker Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 794ccda61c7dc2aa6c66e8ef18a44d865d3c3a7d tree 0df81c4afd909be8545a3e5106c2383867481203 parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046 author Pavel Roskin Tue, 15 Aug 2006 20:42:20 -0400 committer John W. Linville Wed, 23 Aug 2006 14:20:37 -0400 [PATCH] spectrum_cs: Fix incorrect use of pcmcia_dev_present() This bug was introduced during the PCMCIA API conversion and broke spectrum_cs completely. Tracked down by Fredrik Tolf Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d55c4a76f26160482158cd43788dcfc96a320a4f tree 1415d9dfc7c630715360e1f9e4243e4f131c933e parent 87589f08beaec3e1f8a3af0c72406c845f706821 author Li Yang Wed, 23 Aug 2006 14:13:08 +0800 committer Paul Mackerras Wed, 23 Aug 2006 17:12:33 +1000 [POWERPC] Fix compile problem without CONFIG_PCI Compile fails without defining CONFIG_PCI. The patch fix this. [paulus@samba.org: Moved of_irq_pci_swizzle so we only need one #ifdef] Signed-off-by: Li Yang Signed-off-by: Paul Mackerras commit 87589f08beaec3e1f8a3af0c72406c845f706821 tree 4402e8dc8fa204c0484fe0741eb09710f2be5bab parent be9633e96a9e33ab97776bb6874244fa4db6987d author Paul Mackerras Wed, 23 Aug 2006 16:58:39 +1000 committer Paul Mackerras Wed, 23 Aug 2006 16:58:39 +1000 [POWERPC] Correct masks used in emulating some instructions When we get an illegal instruction exception, we check to see whether the instruction is one that we emulate for the user program. Some of the masks we use in checking whether the offending instruction is one we care about didn't have the top bit set, which is the MSB of the major opcode. Thus some undefined opcodes could get emulated as other (defined but unimplemented) instructions. This corrects the masks. Signed-off-by: Paul Mackerras commit be9633e96a9e33ab97776bb6874244fa4db6987d tree 80a17a362645b4b6e481d970f6f983686a61b3df parent c4342ff92bed26f2e0e3543a9f0fdc5f3a29b8fd author Zang Roy-r61911 Wed, 23 Aug 2006 10:20:27 +0800 committer Paul Mackerras Wed, 23 Aug 2006 15:51:19 +1000 [POWERPC] Pass UPIO_TSI flag to 8259 serial driver The patch passes the UPIO_TSI flag to general 8259 serial driver Signed-off-by: Roy Zang Signed-off-by: Paul Mackerras commit c4342ff92bed26f2e0e3543a9f0fdc5f3a29b8fd tree 1e79e4a33cd9a5e19d7143d6fed20bed9e3adc3a parent 6cdd2bdfb9e2449f1c8a0f729cdf9cfd733dd63f author Zang Roy-r61911 Wed, 23 Aug 2006 10:19:50 +0800 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Update mpc7448hpc2 board irq support using device tree The patch rewrites mpc7448hpc2 board irq support according to the new mpic device tree interface. Signed-off-by: Roy Zang Signed-off-by: Paul Mackerras commit 6cdd2bdfb9e2449f1c8a0f729cdf9cfd733dd63f tree 49b7507b83c82c26f2f0ab5bd1833460b3baac28 parent 5db9fa9593e2ff69f2b95f9d59229dc4faaa564d author Benjamin Herrenschmidt Wed, 23 Aug 2006 11:45:12 +1000 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Fix BootX booting with an initrd The bootx_init.c trampoline didn't properly add the ramdisk to the "reserve map" (list of reserved areas of memory), thus causing all sorts of failures when using BootX with an initrd. Also fixes a possible problem if the ramdisk is located before the device-tree passed by BootX. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5db9fa9593e2ff69f2b95f9d59229dc4faaa564d tree d58ba58c05408edf8993d0da5a31b3ea3df1a053 parent aa74a30be971c632d734e487df42278b1cf85151 author Nathan Lynch Tue, 22 Aug 2006 20:36:05 -0500 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Fix gettimeofday inaccuracies There are two problems in the powerpc gettimeofday code which can cause incorrect results to be returned. The first is that there is a race between do_gettimeofday and the timer interrupt: 1. do_gettimeofday does get_tb() 2. decrementer exception on boot cpu which runs timer_recalc_offset, which also samples the timebase and updates the do_gtod structure with a greater timebase value. 3. do_gettimeofday calls __do_gettimeofday, which leads to the negative result from tb_val - temp_varp->tb_orig_stamp. The second is caused by taking the boot cpu offline, which can cause the value of tb_last_jiffy to be increased past the currently available timebase, causing the same underflow as above. [paulus@samba.org - define and use data_barrier() instead of mb().] Signed-off-by: Nathan Lynch Signed-off-by: Paul Mackerras commit aa74a30be971c632d734e487df42278b1cf85151 tree e6489ffa44feaf4127f33b26d946f28a619f9525 parent 343832734fac000d2d276ccc41955daded1265f5 author Andy Fleming Mon, 21 Aug 2006 14:29:28 -0500 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Fix FEC node in 8540 ADS dts * Fixed the FEC node, and its accompanying PHY * Fixed a spacing issue in the PIC node Signed-off-by: Paul Mackerras commit 343832734fac000d2d276ccc41955daded1265f5 tree 7450a712261fe7ffc02d92cb5fca2adec1ac43de parent 2654d6385f6cad00cfb8f5087aeb10d0ed781e74 author Jon Loeliger Fri, 18 Aug 2006 14:30:35 -0500 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Rewrite the PPC 86xx IRQ handling to use Flat Device Tree IRQ setup now comes from the Flat Device Tree and use the new generic IRQ code. Fixed the fsl_soc.c IRQ OF interrupt node parsing. Removed some unused MPC86xx macro definition. Signed-off-by: Zhang Wei Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras (cherry picked from 919fede6edab94cccb3ca8c1c0b32fa62c9369a5 commit) commit 2654d6385f6cad00cfb8f5087aeb10d0ed781e74 tree a9aebfe0e043a90bc0f537e93453154a3e3cd435 parent ddd64159eb0d090766eee79b191a974ffdd83a42 author Andy Fleming Fri, 18 Aug 2006 18:04:34 -0500 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Add 85xx DTS files to powerpc Added the mpc85xx family of dts files to the powerpc tree Signed-off-by: Paul Mackerras commit ddd64159eb0d090766eee79b191a974ffdd83a42 tree 004015a1fd7b0994ad5196d8642545e55ac7e287 parent 4c86cd9c59428a40233fb707f5de18caa5ab5cb7 author Andy Fleming Thu, 17 Aug 2006 20:24:48 -0500 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Fix CDS IRQ handling and PCI code * Fix IRQ support in the 85xx CDS boards so it uses the new generic stuff * Fix PCI IRQ mapping to use the device tree * Disabled i8259 support to allow the CDS to boot. This will be fixed soon, but the current code doesn't even compile, so this is a vast improvement Signed-off-by: Andy Fleming Signed-off-by: Paul Mackerras commit 4c86cd9c59428a40233fb707f5de18caa5ab5cb7 tree b0ad76cbfdb48041e2f393cc2886c0c79e83ccbc parent 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5 author Andy Fleming Fri, 18 Aug 2006 18:03:08 -0500 committer Paul Mackerras Wed, 23 Aug 2006 15:51:18 +1000 [POWERPC] Fix interrupts on 8540 ADS board * Fixed 8540 ADS support for the new irq layer * Fixed 8540 ADS support for mapping PCI interrupts * Updated 8540 ADS to use device tree for interrupt assignment and sense values Signed-off-by: Paul Mackerras commit c712a9de94a5df5bc0087c14ad0b1aac2c147991 tree 7eb86bba0ff00538b62d555f7fe8478bf28955f0 parent 90414be9523208f0b667fd58c22e26b8db0594de author Alexey Dobriyan Wed, 23 Aug 2006 00:48:33 -0400 committer Dmitry Torokhov Wed, 23 Aug 2006 00:48:33 -0400 Input: remove dead URLs from Doclumentation/input/joystick.txt Closes #2804. Signed-off-by: Alexey Dobriyan Signed-off-by: Dmitry Torokhov commit 90414be9523208f0b667fd58c22e26b8db0594de tree 276db076c7c440fa2bd3706317e370ec3a7e2b23 parent 72a623be00fa3d77724c1b0cac07c1bac60e70a5 author Pozsar Balazs Wed, 23 Aug 2006 00:48:03 -0400 committer Dmitry Torokhov Wed, 23 Aug 2006 00:48:03 -0400 Input: psmouse - fix Intellimouse 4.0 initialization Revert the superfluous initilization causing some mice become jumpy. Signed-off-by: Pozsar Balazs Signed-off-by: Dmitry Torokhov commit 72a623be00fa3d77724c1b0cac07c1bac60e70a5 tree cd9504c0ca36e1426706094ad691554eee39f677 parent 8ea371fb6df5a6e8056265e0089fd578e87797fc author Dmitry Torokhov Wed, 23 Aug 2006 00:47:39 -0400 committer Dmitry Torokhov Wed, 23 Aug 2006 00:47:39 -0400 Input: wistron - fix crash due to referencing __initdata Remove __initdata markings from keymaps as they are used during normal driver operations. Signed-off-by: Dmitry Torokhov commit 8ea371fb6df5a6e8056265e0089fd578e87797fc tree 4c3686a5c6ef6e386ad25998c98873ddc73ff709 parent 2ffc1ccad85e8c2e81a6a4beb390fb4ce143256b author Florin Malita Wed, 23 Aug 2006 00:45:33 -0400 committer Dmitry Torokhov Wed, 23 Aug 2006 00:45:33 -0400 Input: atkbd - fix overrun in atkbd_set_repeat_rate() This was introduced in commit 3d0f0fa0cb554541e10cb8cb84104e4b10828468: bounds checking is performed against period[32] while indexing delay[4]. Spotted by Coverity, CID 1376. Signed-off-by: Florin Malita Signed-off-by: Dmitry Torokhov commit 1bad998a2778055c095b4f2081c68e6bc82f06e2 tree 211492588df1f2746763b9f138ac731a9268d425 parent c46f4774228e4dbf716b713e91ad20db50f629ef parent 3ffaa8c7c0f884171a273cd2145b8fbbf233ba22 author Greg Kroah-Hartman Tue, 22 Aug 2006 15:12:58 -0700 committer Greg Kroah-Hartman Tue, 22 Aug 2006 15:12:58 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit c46f4774228e4dbf716b713e91ad20db50f629ef tree b42e4f30958130e45f217a910f6fc5d8ca79a067 parent 2d8f613160ed303f5fe310f21bba334a4b074fa5 author David S. Miller Mon, 21 Aug 2006 15:27:16 -0700 committer David S. Miller Tue, 22 Aug 2006 14:35:40 -0700 [SPARC64]: Fix pfn_pte() build failure. The "%uhi" needs to be "%%uhi" because we want a real "%" character in the assembler here, instead of an assembler variable expansion. Aparently older GCCs were more liberal and interpreted this %-letter as a literal "%" for whatever reason. Based upon a build failure report from Meelis Roos. Signed-off-by: David S. Miller commit 3ffaa8c7c0f884171a273cd2145b8fbbf233ba22 tree 78529eb063987ea5f89980670c38c6cc7cba271b parent 316c1592bea94ead75301cb764523661fbbcc1ca author Michael Rash Tue, 22 Aug 2006 00:45:22 -0700 committer David S. Miller Tue, 22 Aug 2006 14:33:58 -0700 [TEXTSEARCH]: Fix Boyer Moore initialization bug The pattern is set after trying to compute the prefix table, which tries to use it. Initialize it before calling compute_prefix_tbl, make compute_prefix_tbl consistently use only the data from struct ts_bm and remove the now unnecessary arguments. Signed-off-by: Michael Rash Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 316c1592bea94ead75301cb764523661fbbcc1ca tree df27aac5ed7eab642d31be88150c080bf6f313ec parent e0b7cde9975e17a61b4511c7822803dfb7210011 author Stephen Hemminger Tue, 22 Aug 2006 00:06:11 -0700 committer David S. Miller Tue, 22 Aug 2006 14:33:57 -0700 [TCP]: Limit window scaling if window is clamped. This small change allows for easy per-route workarounds for broken hosts or middleboxes that are not compliant with TCP standards for window scaling. Rather than having to turn off window scaling globally. This patch allows reducing or disabling window scaling if window clamp is present. Example: Mark Lord reported a problem with 2.6.17 kernel being unable to access http://www.everymac.com # ip route add 216.145.246.23/32 via 10.8.0.1 window 65535 Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e0b7cde9975e17a61b4511c7822803dfb7210011 tree df2f6669f5016fb3e9c8d089b0c6c850b6bc8a3e parent 2d8f613160ed303f5fe310f21bba334a4b074fa5 author Patrick McHardy Mon, 21 Aug 2006 15:31:08 -0700 committer David S. Miller Tue, 22 Aug 2006 14:33:56 -0700 [NETFILTER]: arp_tables: fix table locking in arpt_do_table table->private might change because of ruleset changes, don't use it without holding the lock. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2d8f613160ed303f5fe310f21bba334a4b074fa5 tree 7e6878d6391919019b4904714cfe8fc0ef4709be parent 00a2b0f6dd2372842df73de72d51621b539fea44 author Oleg Nesterov Tue, 22 Aug 2006 21:22:13 +0400 committer Greg Kroah-Hartman Tue, 22 Aug 2006 12:52:23 -0700 elv_unregister: fix possible crash on module unload An exiting task or process which didn't do I/O yet have no io context, elv_unregister() should check it is not NULL. Signed-off-by: Oleg Nesterov Acked-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit 00a2b0f6dd2372842df73de72d51621b539fea44 tree 1a6978fe89ed18984254ae4b7f3982ace04fcd90 parent c164a9ba0a8870c5c9d353f63085319931d69f23 author Jan Kara Tue, 15 Aug 2006 13:56:26 +0200 committer Greg Kroah-Hartman Tue, 22 Aug 2006 12:52:23 -0700 Fix possible UDF deadlock and memory corruption (CVE-2006-4145) UDF code is not really ready to handle extents larger that 1GB. This is the easy way to forbid creating those. Also truncation code did not count with the case when there are no extents in the file and we are extending the file. Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit c164a9ba0a8870c5c9d353f63085319931d69f23 tree 7e315a50008d0310dd5572a62baef34ddba89988 parent ac185bdc02c216040f3b83f654d864bd8a29cedc author Sridhar Samudrala Tue, 22 Aug 2006 11:50:39 -0700 committer Greg Kroah-Hartman Tue, 22 Aug 2006 12:52:23 -0700 Fix sctp privilege elevation (CVE-2006-3745) sctp_make_abort_user() now takes the msg_len along with the msg so that we don't have to recalculate the bytes in iovec. It also uses memcpy_fromiovec() so that we don't go beyond the length allocated. It is good to have this fix even if verify_iovec() is fixed to return error on overflow. Signed-off-by: Sridhar Samudrala Signed-off-by: Greg Kroah-Hartman commit f1a58ecae527fc67c87ce4dcb9e73894f64aadfe tree e89e6440350a6990023b77fd5a0d7e9f5f9c4b28 parent d14b50cc60ca465290fcdb3b88e7d5fb684361ed author Tejun Heo Sun, 20 Aug 2006 17:56:38 +0900 committer Jeff Garzik Tue, 22 Aug 2006 06:07:48 -0400 [PATCH] ata_piix: fix ghost device probing by honoring PCS present bits Move out PCS handling from piix_sata_prereset() into piix_sata_present_mask() and use it from newly implemented piix_sata_softreset(). Class codes for devices which are indicated to be absent by PCS are cleared to ATA_DEV_NONE. This fixes ghost device problem reported on ICH6 and 7. This patch moves PCS handling from prereset to softreset, which makes two behavior changes. * perform softreset even when PCS indicates no device * PCS handling is repeated before retrying softresets due to reset failures. Both behavior changes are intended and more consistent with how other drivers behave. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ac185bdc02c216040f3b83f654d864bd8a29cedc tree 7cc59ba443f3fc52d329437949436b5b37f1d7ea parent ae298c98e5ab5bab3b39ffe0c2aebfeb4b1e68a2 parent ba9b5d76372dc290b6ca04dad93927a22c2ac49a author Greg Kroah-Hartman Mon, 21 Aug 2006 14:38:51 -0700 committer Greg Kroah-Hartman Mon, 21 Aug 2006 14:38:51 -0700 Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm commit ae298c98e5ab5bab3b39ffe0c2aebfeb4b1e68a2 tree c7d5775c294b98301fdc726395dfb37d9878461d parent da547d775fa9ba8d9dcaee7bc4e960540e2be576 parent be33c3a67bb717508ab1eab0f2fa570fabcbc4d2 author Greg Kroah-Hartman Mon, 21 Aug 2006 10:24:02 -0700 committer Greg Kroah-Hartman Mon, 21 Aug 2006 10:24:02 -0700 Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block commit be33c3a67bb717508ab1eab0f2fa570fabcbc4d2 tree a3ed181d91d97487b5918a8e8c4eab05166978f1 parent e014ff8d4285b81f0de0719d8eee72bc50bfd4be author Oleg Nesterov Mon, 21 Aug 2006 08:36:12 +0200 committer Jens Axboe Mon, 21 Aug 2006 10:02:54 +0200 [PATCH] cfq_cic_link: fix usage of wrong cfq_io_context Obviously, cfq_cic_link() shouldn't free a just allocated cfq_io_context? The dead key is from __cic, so drop that. Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit e014ff8d4285b81f0de0719d8eee72bc50bfd4be tree 5d60afed23d2f4ced4ccce961415cdfe15295a21 parent 9f83e45eb54fc7198dc59fc63255341851ba4c48 author Oleg Nesterov Mon, 21 Aug 2006 10:02:50 +0200 committer Jens Axboe Mon, 21 Aug 2006 10:02:50 +0200 [PATCH] uninline ioprio_best() Saves 376 bytes (5 callers) for me. Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit 9f83e45eb54fc7198dc59fc63255341851ba4c48 tree 3874581e08052b7f37f164110b3bd44ae5eff291 parent 78bd4d484f81a611ef6ff02f909e576cb9aac7f2 author Oleg Nesterov Mon, 21 Aug 2006 08:34:15 +0200 committer Jens Axboe Mon, 21 Aug 2006 08:34:15 +0200 [PATCH] Fix current_io_context() vs set_task_ioprio() race I know nothing about io scheduler, but I suspect set_task_ioprio() is not safe. current_io_context() initializes "struct io_context", then sets ->io_context. set_task_ioprio() running on another cpu may see the changes out of order, so ->set_ioprio(ioc) may use io_context which was not initialized properly. Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit 78bd4d484f81a611ef6ff02f909e576cb9aac7f2 tree 9ba30e54a16d47b3cf4a9ea0123f7261d52462ab parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046 author Oleg Nesterov Mon, 21 Aug 2006 08:33:23 +0200 committer Jens Axboe Mon, 21 Aug 2006 08:33:23 +0200 [PATCH] sys_ioprio_set: minor do_each_thread+break fix From include/linux/sched.h: * Careful: do_each_thread/while_each_thread is a double loop so * 'break' will not work as expected - use goto instead. */ Signed-off-by: Oleg Nesterov Signed-off-by: Jens Axboe commit da547d775fa9ba8d9dcaee7bc4e960540e2be576 tree e01cb3b682bc0157742d093afc18a89dfc01d1f1 parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046 parent 5b9c9bf6c92274a6eb74fc8f86586ab592a7a1ec parent df6fd31995cb2e38b2a7e94bc8f1559b8f55404e parent 4e6e6504a4572dee3afcb0925ce92ad559e1e0db parent 5672bde6355f2d12c49df1eec083d25afe489063 parent 16a74744231e57e354253567490ab9e4ccd2d605 author Len Brown Sun, 20 Aug 2006 21:49:29 -0400 committer Len Brown Sun, 20 Aug 2006 21:49:29 -0400 Merge trivial low-risk suspend hotkey bugzilla-5918 into release commit a76b044af147135b5fb7570aba35d4908f143cc9 tree 600000a46abd1ce07ea8e2d73fe0bed1df7178fc parent 2ca2d5e84c19ddbc0126087af6288533a05f1799 author Krzysztof Halasa Wed, 16 Aug 2006 01:52:23 +0200 committer Jeff Garzik Sat, 19 Aug 2006 17:51:25 -0400 [PATCH] WAN: fix C101 card carrier handling Hi, One of my recent changes broke C101 carrier handling, this patch fixes it. Also fixes an old TX underrun checking bug. 2.6.18 material. Please apply. Thanks. Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit 2ca2d5e84c19ddbc0126087af6288533a05f1799 tree 4d8014f576180e9a689dfcb9d405d412b19471ef parent 5b4b8454344a0391bb0f69fda0f4ec8e1f0d2fed author Vitaly Bordug Mon, 14 Aug 2006 23:00:31 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:31 -0400 [PATCH] ppc32: board-specific part of fs_enet update This contains board-specific portion to respect driver changes (for 8272ads , 885ads and 866ads). Altered platform_data structures as well as initial setup routines relevant to fs_enet. Changes to the mpc8560ads ppc/ code are also introduced, but mainly as reference, since the entire board support is going to appear in arch/powerpc. Signed-off-by: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5b4b8454344a0391bb0f69fda0f4ec8e1f0d2fed tree a5e662cdc03d319e56a277281dcde754150276f4 parent 11b0bacd717c285c94dbb56505a28434b34f0639 author Vitaly Bordug Mon, 14 Aug 2006 23:00:30 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:31 -0400 [PATCH] FS_ENET: use PAL for mii management This patch should update the fs_enet infrastructure to utilize Phy Abstraction Layer subsystem. Along with the above, there are apparent bugfixes, overhaul and improvements. Signed-off-by: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 11b0bacd717c285c94dbb56505a28434b34f0639 tree d98e1576210a258d3b412809dfe0177f028575be parent ec42cdb624059bb9d9d1accca5ed4345bf8f5fda author Vitaly Bordug Mon, 14 Aug 2006 23:00:29 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:31 -0400 [PATCH] PAL: Support of the fixed PHY This makes it possible for HW PHY-less boards to utilize PAL goodies. Generic routines to connect to fixed PHY are provided, as well as ability to specify software callback that fills up link, speed, etc. information into PHY descriptor (the latter feature not tested so far). Signed-off-by: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit ec42cdb624059bb9d9d1accca5ed4345bf8f5fda tree 5b39ebb8cd878baf0cb3f1a1b1f94994ab00fac5 parent 3d8f3f3c3697a7603a802427c9226f5dfe6d67ad author Alexey Dobriyan Mon, 14 Aug 2006 23:00:28 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:30 -0400 [PATCH] xircom_cb: wire up errors from pci_register_driver() Signed-off-by: Alexey Dobriyan Cc: Jeff Garzik Cc: Dominik Brodowski Cc: Valerie Henson Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 3d8f3f3c3697a7603a802427c9226f5dfe6d67ad tree c6deeab098c67b4a303630ac9430cbec0d45d5c6 parent 239e44e1f05e2163ee066c07a753f9fb445979b2 author Heiko Carstens Mon, 14 Aug 2006 23:00:27 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:30 -0400 [PATCH] s390: fix arp_tbl lock usage in qeth qeth: bhs must be disabled when accessing neighbour tables. ================================= [ INFO: inconsistent lock state ] Signed-off-by: Jeff Garzik commit 239e44e1f05e2163ee066c07a753f9fb445979b2 tree a27bbfc4d0fc2e31387f00096c8c3bc717df797c parent b68a60e598c0d1e738c807c47cb181e8cc52a0d8 author Edgar E. Iglesias Mon, 14 Aug 2006 23:00:24 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:30 -0400 [PATCH] skge: remember to run netif_poll_disable() Signed-off-by: Edgar E. Iglesias Cc: Stephen Hemminger Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b68a60e598c0d1e738c807c47cb181e8cc52a0d8 tree cc06e0cd5a74c4ebdc5e5fecd2ab7a47d28f8130 parent 7e29f8bf39de372e3903a0b12f34285d30a8a244 author Jim Lewis Mon, 14 Aug 2006 23:00:23 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:30 -0400 [PATCH] Add ethtool -g support to Spidernet network driver Add ethtool -g (show ring sizes) support to the Spidernet network driver. Signed-off-by: James K Lewis Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 7e29f8bf39de372e3903a0b12f34285d30a8a244 tree c0c1fee1da797d3147a0359e7c6f054aaa745ce1 parent b933b4d93888b584eda826bffa68a3a1283f8411 author David Brownell Mon, 14 Aug 2006 23:00:22 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:30 -0400 [PATCH] build fixes: smc91x Unclear how these bugs arrived, presumably from incorrect cleanup of the 16-bit-only paths, but smc91x wouldn't build for OMAP. Signed-off-by: David Brownell Cc: Nicolas Pitre Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b933b4d93888b584eda826bffa68a3a1283f8411 tree 3d1ac29f142f1248ec5e5aa9994545818ab0f301 parent 76cb4fe7c0926c2c59f4a36ab169aa2d547c93d1 author Roger Luethi Mon, 14 Aug 2006 23:00:21 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:30 -0400 [PATCH] via-rhine: add option avoid_D3 (work around broken BIOSes) It looks like broken BIOSes controlling Rhine chips will remain in use in significant numbers; such systems fail to come up via PXE after they have been put into D3 (power-saving) mode. This patch adds a module option for disabling the call that puts the chip to sleep. Signed-off-by: Roger Luethi Cc: Jeff Garzik Cc: Joerg Bashir Cc: Tim Phipps Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 76cb4fe7c0926c2c59f4a36ab169aa2d547c93d1 tree 2fa424665a54379e3d3ee07e7b9d6beb6101a462 parent ab1976682f31661a898b92593bccfeae14d0a0ae author Russell King Mon, 14 Aug 2006 23:00:20 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] lockdep: fix smc91x When booting using root-nfs, I'm seeing (independently) two lockdep dumps in the smc91x driver. The patch below fixes both. Both dumps look like real locking issues. Nico - please review and ack if you think the patch is correct. Dump 1: Sending DHCP requests . ================================= [ INFO: inconsistent lock state ] Signed-off-by: Jeff Garzik commit ab1976682f31661a898b92593bccfeae14d0a0ae tree 3f24400e997275daa7ef117498037b54f8a4ce63 parent 633949a145df19d6d338b0f227f033a0a1c5562a author Stephen Hemminger Mon, 14 Aug 2006 23:00:18 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] via-rhine: NAPI poll enable The poll_enable should be in init_registers before enabling interrupts, not in tx_timeout. Thanks for spotting it Roger. Signed-off-by: Stephen Hemminger Cc: Roger Luethi Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 633949a145df19d6d338b0f227f033a0a1c5562a tree d000e88532f0420eeb42c2525ae3a8d44818a29f parent a4d09272480e57cd4aa1156cac7aba9b08885bf9 author Roger Luethi Mon, 14 Aug 2006 23:00:17 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] via-rhine: NAPI support Add NAPI support to the via-rhine driver so that it can handle higher speeds and doesn't get overloaded by interrupts as easily. Signed-off-by: Stephen Hemminger Signed-off-by: Roger Luethi Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit a4d09272480e57cd4aa1156cac7aba9b08885bf9 tree 5c073158dfc31a6842a75fbf22f80bb304dff934 parent 2fd0e33f4f967022ef2f3249b6c512b309734384 author Peter Korsgaard Mon, 14 Aug 2006 23:00:17 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] smc911x: Re-release spinlock on spurious interrupt The smc911x driver forgets to release the spinlock on spurious interrupts. This little patch fixes it. Cc: Jeff Garzik Signed-off-by: Peter Korsgaard Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 2fd0e33f4f967022ef2f3249b6c512b309734384 tree bffe84f8bc99cae4e3d9d5dcdb637534574aa8c5 parent 330ce0de93fd7cc0f72fa57a7ec892befe7035d2 author Kevin Hao Mon, 14 Aug 2006 23:00:15 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] net: Add netconsole support to dm9000 driver Add netconsole support to dm9000 driver. Cc: Jeff Garzik Cc: Sascha Hauer Cc: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 330ce0de93fd7cc0f72fa57a7ec892befe7035d2 tree a5c73ae34d2e17ed21f479b74ee76cc27f132e3c parent 6fd7587bc284af61f92e547287aa5cd616a9c7ba author Andrew Morton Mon, 14 Aug 2006 23:00:14 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] s2io build fix sparc32: drivers/net/s2io.c:2636: warning: implicit declaration of function 'disable_irq' drivers/net/s2io.c:2656: warning: implicit declaration of function 'enable_irq' Cc: Ananda Raju Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6fd7587bc284af61f92e547287aa5cd616a9c7ba tree 432fc5550fc21d2f6748e97cf3f15d845d3be3e3 parent ce973b141dfac4a0f160c7435d65e3ea47753ce8 author Deepak Saxena Mon, 14 Aug 2006 23:00:13 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] Update smc91x driver with ARM Versatile board info We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new generic IRQ layer will complain thusly: No IRQF_TRIGGER set_type function for IRQ 25 () Signed-off-by: Deepak Saxena Cc: Jeff Garzik Cc: Russell King Cc: Nicolas Pitre Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit ce973b141dfac4a0f160c7435d65e3ea47753ce8 tree 2dfda8aa29023fca37e1f5127d2e5e6fae1c6180 parent e4c780b1ffc7d7bc27b7dc57fcf17ebb8d3006bc author Li Yang Mon, 14 Aug 2006 23:00:11 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:29 -0400 [PATCH] Freescale QE UCC gigabit ethernet driver QE(QUICC Engine) is a new generation communication coprocessor, which can be found on some of the latest Freescale PowerQUICC CPUs(e.g. MPC8360). The UCC(Unified Communications Controller) module of QE can work as gigabit Ethernet device. This patch provides driver for the device. Signed-off-by: Shlomi Gridish Signed-off-by: Li Yang Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e4c780b1ffc7d7bc27b7dc57fcf17ebb8d3006bc tree 5d7858b0067f56d3584c1ff572211edd106f74c0 parent 3418e469ebaebec16f7df83074087eb901fb76b9 author Adrian Bunk Mon, 14 Aug 2006 23:00:10 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:28 -0400 [PATCH] drivers/net/e1000/: possible cleanups - make needlessly global functions static - #if 0 the following unused global functions: - e1000_hw.c: e1000_mc_addr_list_update() - e1000_hw.c: e1000_read_reg_io() - e1000_hw.c: e1000_enable_pciex_master() - e1000_hw.c: e1000_ife_disable_dynamic_power_down() - e1000_hw.c: e1000_ife_enable_dynamic_power_down() - e1000_hw.c: e1000_write_ich8_word() - e1000_hw.c: e1000_duplex_reversal() - e1000_main.c: e1000_io_read() Signed-off-by: Adrian Bunk Cc: John Ronciak Cc: Jesse Brandeburg Cc: Jeff Kirsher Cc: Auke Kok Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 3418e469ebaebec16f7df83074087eb901fb76b9 tree afeabd4c0dec7a9e6433711739d8639736adb55b parent 90d5aed2d9c7d2f3915b75342988114fd7b6c13d author Andrew Morton Mon, 14 Aug 2006 23:00:10 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:28 -0400 [PATCH] sundance section fix drivers/net/sundance.c:110: error: version causes a section type conflict I don't understand this error. It's referred to from both __init and __devinit code. With CONFIG_HOTPLUG=n, version[] is placed in .init.data and is referred to from .init.text. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 90d5aed2d9c7d2f3915b75342988114fd7b6c13d tree c6f31166423c921264746d55606e852ae54bd6bf parent c9d26c9785d900d8547b268f0c0507f252879c48 author Andrew Morton Mon, 14 Aug 2006 23:00:09 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:28 -0400 [PATCH] fealnx section fix With CONFIG_HOTPLUG=n it won't compile: distcc[25607] ERROR: compile drivers/net/fealnx.c on g5/64 failed version[] is referred to from both __init code and from __devinit code, so move it out of __init altogether. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c9d26c9785d900d8547b268f0c0507f252879c48 tree c5a7b9271bdb12eb59c0eae0e5280d2b4c6d25eb parent c971ef46cb94b8bb4a12555fa757e5f67934fcd9 author Andrew Morton Mon, 14 Aug 2006 23:00:08 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:44:28 -0400 [PATCH] winbond-840 section fix With CONFIG_HOTPLUG=n it won't compile: drivers/net/tulip/winbond-840.c:141: error: version causes a section type conflict (For some reason it gets the same error if marked __initdata. Give up.) Cc: Valerie Henson Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c971ef46cb94b8bb4a12555fa757e5f67934fcd9 tree 550066c59719ab851cc29c2b1cb38bf79d0168f6 parent 1e13b0d82d24ac3c8b2f16a09dd9ce537cad134c author Andrew Morton Mon, 14 Aug 2006 23:00:08 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:17 -0400 [PATCH] seeq8005 section fix WARNING: drivers/net/seeq8005.o - Section mismatch: reference to .init.text:seeq8005_probe from .text between 'init_module' (at offset 0x106) and 'seeq8005_open' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 1e13b0d82d24ac3c8b2f16a09dd9ce537cad134c tree 635d9f406619002c29cdb09c59d9ad0537fa66f9 parent 5e5fa01d55e9949660a89b23f4a43884eaf49097 author Andrew Morton Mon, 14 Aug 2006 23:00:07 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:17 -0400 [PATCH] ni65 section fix WARNING: drivers/net/ni65.o - Section mismatch: reference to .init.text:ni65_probe from .text between 'init_module' (at offset 0x54a) and 'ni65_stop_start' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5e5fa01d55e9949660a89b23f4a43884eaf49097 tree 14be2d40add932e7313099740c0990c8814c3851 parent daca7cd7612639848c39744e02dab537755b31a1 author Andrew Morton Mon, 14 Aug 2006 23:00:06 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:17 -0400 [PATCH] wd section fix WARNING: drivers/net/wd.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xfd) and 'wd_open' WARNING: drivers/net/wd.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x14b) and 'wd_open' WARNING: drivers/net/wd.o - Section mismatch: reference to .init.data:wd_portlist from .text between 'init_module' (at offset 0x17f) and 'wd_open' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit daca7cd7612639848c39744e02dab537755b31a1 tree 2b7a6be6773fca149d6f36da84b82dedc8957351 parent 6d2cdb4fd1cc1b15ad070a57c9b2bc40bb1565e7 author Andrew Morton Mon, 14 Aug 2006 23:00:06 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:16 -0400 [PATCH] smctr section fix WARNING: drivers/net/tokenring/smctr.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x2ba0) and 'smctr_reset_adapter' WARNING: drivers/net/tokenring/smctr.o - Section mismatch: reference to .init.text:smctr_probe from .text between 'init_module' (at offset 0x2bf4) and 'smctr_reset_adapter' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6d2cdb4fd1cc1b15ad070a57c9b2bc40bb1565e7 tree 3b5165c848cdc720dc19ee8f0446e38dfe2cacaa parent 19a8664d8a05f75cab3cd4eb8022d22d3f0c53c3 author Andrew Morton Mon, 14 Aug 2006 23:00:05 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:16 -0400 [PATCH] ibmtr section fix WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_mem_base from .text between 'ibmtr_probe1' (at offset 0x6e6) and 'ibmtr_probe_card' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_mem_base from .text between 'ibmtr_probe1' (at offset 0x74a) and 'ibmtr_probe_card' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_mem_base from .text between 'ibmtr_probe1' (at offset 0x7fd) and 'ibmtr_probe_card' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 19a8664d8a05f75cab3cd4eb8022d22d3f0c53c3 tree 8838993ab88afcf6e37c475051676cd5b469d277 parent dab3d02ec05d16aab680de471cb5d20c5d4852e8 author Andrew Morton Mon, 14 Aug 2006 23:00:05 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:16 -0400 [PATCH] ni52 section fix WARNING: drivers/net/ni52.o - Section mismatch: reference to .init.text:ni52_probe from .text between 'init_module' (at offset 0x997) and 'ni52_close' WARNING: drivers/net/ni65.o - Section mismatch: reference to .init.text:ni65_probe from .text between 'init_module' (at offset 0x54a) and 'ni65_stop_start' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit dab3d02ec05d16aab680de471cb5d20c5d4852e8 tree f70ca2ccbb33ecde64575170ac6079ac680c0802 parent 3805f0e28ca313893b87e881201561d5c1857dd8 author Andrew Morton Mon, 14 Aug 2006 23:00:04 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:16 -0400 [PATCH] lne390 section fix WARNING: drivers/net/lne390.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x100) and 'lne390_close' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 3805f0e28ca313893b87e881201561d5c1857dd8 tree 0c12ca79dc2cf4b20c1669903586811c8f6c8cf1 parent 58f149fc65ebced1148789cfb37457a8c7aaca75 author Andrew Morton Mon, 14 Aug 2006 23:00:03 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:16 -0400 [PATCH] lance section fix WARNING: drivers/net/lance.o - Section mismatch: reference to .init.data:lance_portlist from .text between 'init_module' (at offset 0x8d3) and 'lance_purge_ring' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 58f149fc65ebced1148789cfb37457a8c7aaca75 tree 1ef93d92b6e75e1bfdbfe3ae66c373902d80a9f0 parent 5757f5c6d7d9cbe4bf6a464f1842a767f505d440 author Andrew Morton Mon, 14 Aug 2006 23:00:03 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:16 -0400 [PATCH] eth16i section fix WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.data:cardname from .text between 'init_module' (at offset 0x6d2) and 'eth16i_multicast' WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x6ef) and 'eth16i_multicast' WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x702) and 'eth16i_multicast' WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.data:cardname from .text between 'init_module' (at offset 0x70e) and 'eth16i_multicast' WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x71d) and 'eth16i_multicast' WARNING: drivers/net/eth16i.o - Section mismatch: reference to .init.data:cardname from .text between 'init_module' (at offset 0x729) and 'eth16i_multicast' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5757f5c6d7d9cbe4bf6a464f1842a767f505d440 tree 2328e0ea7e58284e255a0efcbfaa5fca71cc42e9 parent b1176b95b4b851b05a2f541ef54e7ce3ed358d19 author Andrew Morton Mon, 14 Aug 2006 23:00:02 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:16 -0400 [PATCH] es3210 section fix WARNING: drivers/net/es3210.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xdf) and 'es_close' WARNING: drivers/net/es3210.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x100) and 'es_close' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b1176b95b4b851b05a2f541ef54e7ce3ed358d19 tree b89c89277d6b8aa74aca7f05fe11b558a3a522f1 parent 02a3245fcf0911ff92100aa54823dc1c5950fba9 author Andrew Morton Mon, 14 Aug 2006 23:00:01 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] eexpress section fix WARNING: drivers/net/eexpress.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x6c3) and 'eexp_hw_lasttxstat' WARNING: drivers/net/eexpress.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x74f) and 'eexp_hw_lasttxstat' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 02a3245fcf0911ff92100aa54823dc1c5950fba9 tree 64d5f935e051e3377e608183888988ab4e97d9c5 parent d543cbb6d192313d9027ed09c7a1e085b1234082 author Andrew Morton Mon, 14 Aug 2006 23:00:01 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] eepro section fix WARNING: drivers/net/eepro.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x284) and 'eepro_ethtool_get_drvinfo' WARNING: drivers/net/eepro.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x2a7) and 'eepro_ethtool_get_drvinfo' WARNING: drivers/net/eepro.o - Section mismatch: reference to .init.data:eepro_portlist from .text between 'init_module' (at offset 0x2b3) and 'eepro_ethtool_get_drvinfo' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d543cbb6d192313d9027ed09c7a1e085b1234082 tree 32be5033c73d5ea47ec05b7147dcaf33116dc4cb parent 5d930108c914c04fbb0bfbb059d23a5fcaf0d1e7 author Andrew Morton Mon, 14 Aug 2006 23:00:00 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] e2100 section fix WARNING: drivers/net/e2100.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xd9) and 'e21_reset_8390' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5d930108c914c04fbb0bfbb059d23a5fcaf0d1e7 tree fd23d6c39c9860e49e8a6faac0c2dec6ad21751e parent e26c129a49a7a4990f362a9cdb3084198b4d9d7b author Andrew Morton Mon, 14 Aug 2006 22:59:59 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] at1700 section fix WARNING: drivers/net/at1700.o - Section mismatch: reference to .init.text:at1700_probe from .text between 'init_module' (at offset 0x75) and 'net_get_stats' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e26c129a49a7a4990f362a9cdb3084198b4d9d7b tree c75a8653a660579065ac5c1767622265c90bf250 parent 5f3bc456ce190a963a8816be5a318df9998f3bc5 author Andrew Morton Mon, 14 Aug 2006 22:59:59 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] cs89x0 section fix WARNING: drivers/net/cs89x0.o - Section mismatch: reference to .init.data:version from .text between 'init_module' (at offset 0x13d8) and 'net_get_stats' WARNING: drivers/net/cs89x0.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x1634) and 'net_get_stats' WARNING: drivers/net/cs89x0.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x1a1f) and 'net_get_stats' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5f3bc456ce190a963a8816be5a318df9998f3bc5 tree 562371db20835786b44a2588d7d7a8f00b6c15ad parent 62a87b8051ded3d1fcb89773c9febd1bb34d3cbd author Andrew Morton Mon, 14 Aug 2006 22:59:58 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] cops section fix WARNING: drivers/net/appletalk/cops.o - Section mismatch: reference to .init.text:cops_probe from .text between 'init_module' (at offset 0xae) and 'cops_rx' Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 62a87b8051ded3d1fcb89773c9febd1bb34d3cbd tree 0216e4fec6dc6af488a58b6e0da427d7336565db parent 864fe05dfa4ff3e230acf3b4ccf878b6f22603c4 author Andrew Morton Mon, 14 Aug 2006 22:59:57 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] ac3200 section fixes WARNING: drivers/net/ac3200.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0xf9) and 'ac_close_card' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 864fe05dfa4ff3e230acf3b4ccf878b6f22603c4 tree be3eb18d68f4a60a4f5341e5163981c4638bdaf8 parent 41ace1861a93f12f70ff10026fb1539fea38fcf8 author Andrew Morton Mon, 14 Aug 2006 22:59:57 -0700 committer Jeff Garzik Sat, 19 Aug 2006 17:40:15 -0400 [PATCH] 82596 section fixes WARNING: drivers/net/82596.o - Section mismatch: reference to .init.text:i82596_probe from .text between 'init_module' (at offset 0x141) and 'i596_add_cmd' Also nail a couple of crazy inlines. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d14b50cc60ca465290fcdb3b88e7d5fb684361ed tree c4a712123b94cd4c0ab4d8d9d87a7619e9bcb6ba parent a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046 author Jeff Garzik Sat, 19 Aug 2006 17:27:12 -0400 committer Jeff Garzik Sat, 19 Aug 2006 17:27:12 -0400 Merge branch 'master' into upstream-fixes commit 41ace1861a93f12f70ff10026fb1539fea38fcf8 tree c6d841ae9b73d6b7d6a887c21ce378cebc9c97f7 parent 09e590e5d5a93f2eaa748a89c623258e6bad1648 parent ef7d1b244fa6c94fb76d5f787b8629df64ea4046 author Jeff Garzik Sat, 19 Aug 2006 17:25:34 -0400 committer Jeff Garzik Sat, 19 Aug 2006 17:25:34 -0400 Merge branch 'master' into upstream-fixes commit 48e2691f9c3bd6719e773f0b883449f4cef39585 tree 881824d59283e1dca8865d4e84a9e40baf5e5891 parent a90f56847e8df9034c1c05d1157e1b0cd96987fb author James Smart Thu, 17 Aug 2006 11:58:11 -0400 committer James Bottomley Sat, 19 Aug 2006 13:46:47 -0700 [SCSI] lpfc 8.1.9 : Change version number to 8.1.9 Change version number to 8.1.9 Signed-off-by: James Smart Signed-off-by: James Bottomley commit a90f56847e8df9034c1c05d1157e1b0cd96987fb tree d0ec40b563855c7100675e800c2a95c711cd376d parent 33ccf8d1080bdccb4751a92f6da361a6e01b7cc0 author James Smart Thu, 17 Aug 2006 11:58:04 -0400 committer James Bottomley Sat, 19 Aug 2006 13:46:30 -0700 [SCSI] lpfc 8.1.9 : Stall eh handlers if resetting while rport blocked Stall error handler if attempting resets/aborts while an rport is blocked. This avoids device offline scenarios due to errors in the error handler. Background: Although the transport is using the scsi_timed_out functionality to restart the timeout if the rport is blocked, if the timeout has already fired before the block occurs, the eh handler still runs and can take the device offline. Ultimately, this window cannot be resolved without significant work in the error handler thread. Christoph noted the first level of these issues when he noted the poor error response handling by the error thread. We found, under heavy load and error testing, that time window from when the scsi_times_out() adds the io to the queue to when the scsi_error_handler gets around to servicing it, can be in the several seconds range. In most cases, these test conditions are highly unusual, but possible. As a result, we're stalling the error handler in this race window so that we can avoid the device_offline transitions. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 33ccf8d1080bdccb4751a92f6da361a6e01b7cc0 tree 48128e331e0e46af0258864325eb1550287cca61 parent 3a0c56d801df6785b30e36c19e89d7e971c151da author James Smart Thu, 17 Aug 2006 11:57:58 -0400 committer James Bottomley Sat, 19 Aug 2006 13:46:05 -0700 [SCSI] lpfc 8.1.9 : Misc Bug Fixes Misc Bug Fixes: - Cap MBX_DOWN_LINK command timeout to 60 seconds - Fix double free of ndlp object - Don't free mbox structures on error. The completion handlers expect to do so. - Clear host attention work items when going offline - Fixed discovery issues in multi-initiator environments. Signed-off-by: James Smart Signed-off-by: James Bottomley commit ef7d1b244fa6c94fb76d5f787b8629df64ea4046 tree eb6b35bb250f46d75853764bd9309c75e4f03c72 parent ed0da6fc9d3096f54c4a76737eeae57ac81418cf parent 78eb887733ec8ff5d6e6c69e3c32a187a9303622 author Greg Kroah-Hartman Fri, 18 Aug 2006 11:02:52 -0700 committer Greg Kroah-Hartman Fri, 18 Aug 2006 11:02:52 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 5beba53230351b2d77c317c22e66c415f2ebaf02 tree 0f70ebff5d478d36d8440aebac5e311b0cfe5e74 parent acaea9ee460d0ba5a14f0066ba26cfa43dd5fdf3 author Roland Dreier Fri, 18 Aug 2006 10:41:46 -0700 committer Roland Dreier Fri, 18 Aug 2006 10:41:46 -0700 IB/mthca: No userspace SRQs if HCA doesn't have SRQ support Leave all SRQ methods out of the device's uverbs_cmd_mask if the device doesn't have SRQ support (because of ancient firmware) so that we don't allow userspace to call the driver's create_srq method. This fixes a userspace-triggerable oops caused by ib_uverbs_create_srq() following the device's ->create_srq function pointer, which will be NULL if the device doesn't support SRQs. Signed-off-by: Roland Dreier commit df6fd31995cb2e38b2a7e94bc8f1559b8f55404e tree b6e14215a9a9757d6f149c75b5543a31c0f6766e parent d68909f4c3eee09c13d4e5c86512c6c075553dbd author Starikovskiy, Alexey Y Fri, 18 Aug 2006 11:23:00 -0400 committer Len Brown Fri, 18 Aug 2006 12:56:50 -0400 ACPI: relax BAD_MADT_ENTRY check to allow LSAPIC variable length string UIDs ACPI 3.0 appended a variable length UID string to the LAPIC structure as part of support for > 256 processors. So the BAD_MADT_ENTRY() sanity check can no longer compare for equality with a fixed structure length. Signed-off-by: Alexey Y Starikovskiy Signed-off-by: Len Brown commit ba9b5d76372dc290b6ca04dad93927a22c2ac49a tree da57578e06ded3b2384b4b2a53f32068b592bab1 parent 90af774ab150b97c0aa8ed0375f4652be986bdce author Nicolas Pitre Fri, 18 Aug 2006 17:20:15 +0100 committer Russell King Fri, 18 Aug 2006 17:20:15 +0100 [ARM] 3746/2: Userspace helpers must be Thumb mode interworkable Patch from Nicolas Pitre The userspace helpers in clean/arch/arm/kernel/entry-armv.S are called directly in/from userspace. They need to cope with being called from Thumb code. Patch below uses the bx interworking instruction when CONFIG_ARM_THUMB=y. Based on an earlier patch from Paul Brook Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit ed0da6fc9d3096f54c4a76737eeae57ac81418cf tree 3bf45a192d991c5a5c80ac86eb333f9a4f796044 parent 774bd8613d0188cda72408f8ffce258d73953cad parent 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5 author Greg Kroah-Hartman Fri, 18 Aug 2006 09:20:04 -0700 committer Greg Kroah-Hartman Fri, 18 Aug 2006 09:20:04 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc commit 90af774ab150b97c0aa8ed0375f4652be986bdce tree 527317a6af739ea7f5c9337cccc7b148e497f5ec parent 3a834635e8953839dba3f417a26414039b0c7c48 author Catalin Marinas Fri, 18 Aug 2006 15:34:46 +0100 committer Russell King Fri, 18 Aug 2006 15:34:46 +0100 [ARM] 3757/1: Use PROCINFO_INITFUNC in head.S Patch from Catalin Marinas This is instead of a magic number. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 3a834635e8953839dba3f417a26414039b0c7c48 tree 2b4d475387ed30514cc05be3cf98458ca56dd77a parent e2785f0d4251c35d6e82ec819354374c8c17d63d author Paul Gortmaker Fri, 18 Aug 2006 15:32:17 +0100 committer Russell King Fri, 18 Aug 2006 15:32:17 +0100 [ARM] 3756/1: Assign value for HWCAP_IWMMXT Patch from Paul Gortmaker Some folks here at Wind River asked me if I'd push this out so that the value was generally agreed upon in advance by all folks interested in working with iWMMXt. Seems simple enough... Signed-off-by: Paul Gortmaker Signed-off-by: Russell King commit e2785f0d4251c35d6e82ec819354374c8c17d63d tree a3d3f046c4ea1f0ee0fd13187ca71277fd70ff2b parent 332158e7c206dc6bee0dfb24f2c1d6096e0989cd author Kevin Hilman Fri, 18 Aug 2006 15:32:14 +0100 committer Russell King Fri, 18 Aug 2006 15:32:14 +0100 [ARM] 3755/1: dmabounce: fix return value for find_safe_buffer Patch from Kevin Hilman Previous locking changes to dmabounce incorrectly return non-NULL even when buffer not found. Fix it up. Signed-off-by: Kevin Hilman Signed-off-by: Russell King commit 332158e7c206dc6bee0dfb24f2c1d6096e0989cd tree a56e5b1c9b8af8c8a74dee6ec5a8d00d2ae09235 parent f57e1abd1bb297994c7398478b4c37e628095243 author Ben Dooks Fri, 18 Aug 2006 15:32:12 +0100 committer Russell King Fri, 18 Aug 2006 15:32:12 +0100 [ARM] 3754/1: S3C24XX: tidy arch/arm/mach-s3c2410/Makefile Patch from Ben Dooks tidy up the makefile by using TABs to indent, and ensure that all items are indented the same. Move the DMA to its own section, ready for the next set of updates Signed-off-by: Ben Dooks Signed-off-by: Russell King commit f57e1abd1bb297994c7398478b4c37e628095243 tree f25447fd37bf0b56c5aa8b197570ac802d8ac904 parent a0c5a64552e3c57d7f9eb593c6ce21a285ac86b4 author Ben Dooks Fri, 18 Aug 2006 15:32:10 +0100 committer Russell King Fri, 18 Aug 2006 15:32:10 +0100 [ARM] 3753/1: S3C24XX: DMA fixes Patch from Ben Dooks A number of small issues with the S3C24XX DMA have cropped up, which this patch fixes. These are: - check wether we can load another buff in start - update state handling in s3c2410_dma_lastxfer - only reload in irq if channel is not idle - more informative timeout errors (add source) - do not call request_irq() with irqs locked - added waitforstop function The patch also adds a S3C2410_DMAOP_STARTED for the occasions when the driver wants to ensure that the DMA system load state is resynced after loading. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 78eb887733ec8ff5d6e6c69e3c32a187a9303622 tree 1028d082b0240f04f1b0d8f91b9e2813e329710c parent 8311731afc439f508ab4d759edadedae75afb73e author Herbert Xu Thu, 17 Aug 2006 18:22:32 -0700 committer David S. Miller Thu, 17 Aug 2006 18:22:32 -0700 [BRIDGE]: Disable SG/GSO if TX checksum is off When the bridge recomputes features, it does not maintain the constraint that SG/GSO must be off if TX checksum is off. This patch adds that constraint. On a completely unrelated note, I've also added TSO6 and TSO_ECN feature bits if GSO is enabled on the underlying device through the new NETIF_F_GSO_SOFTWARE macro. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8311731afc439f508ab4d759edadedae75afb73e tree c1f63cd1d4e10b6a62c3a62e2407c998d9fbaec6 parent d205dc40798d97d63ad348bfaf7394f445d152d4 author Patrick McHardy Thu, 17 Aug 2006 18:13:53 -0700 committer David S. Miller Thu, 17 Aug 2006 18:13:53 -0700 [NETFILTER]: ip_tables: fix table locking in ipt_do_table table->private might change because of ruleset changes, don't use it without holding the lock. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d205dc40798d97d63ad348bfaf7394f445d152d4 tree 603d58aaacec053300396db71b7143ea115ee902 parent 6e8fcbf64024f9056ba122abbb66554aa76bae5d author Patrick McHardy Thu, 17 Aug 2006 18:12:38 -0700 committer David S. Miller Thu, 17 Aug 2006 18:12:38 -0700 [NETFILTER]: ctnetlink: fix deadlock in table dumping ip_conntrack_put must not be called while holding ip_conntrack_lock since destroy_conntrack takes it again. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5 tree d9b8ab7ddcdfd2a97b3dcb5aca8ecfdbe0e8c0ca parent 5315862045c5dc5dfe0754fbd07df1350180628a author Jon Loeliger Thu, 17 Aug 2006 12:24:42 -0500 committer Paul Mackerras Fri, 18 Aug 2006 10:08:37 +1000 [POWERPC] Fix the mpc8641_hpcn.dts file. Add 'linux,phandle' entry to i8259@4d0 node. Signed-off-by: Zhang Wei Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 5315862045c5dc5dfe0754fbd07df1350180628a tree 233c42e4d675a73e0024a154ae0d162943a22133 parent 707ba16f0ffed3b83ced3c7f4d4d332a70f8b41d author Jon Loeliger Wed, 09 Aug 2006 10:37:28 -0500 committer Paul Mackerras Fri, 18 Aug 2006 10:08:36 +1000 [POWERPC] Offer PCI as a CONFIG choice for PPC_86xx. Also fix 80-column run-over. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 707ba16f0ffed3b83ced3c7f4d4d332a70f8b41d tree b09fd11a02e17ab66a9bafbf53463e03dc713bb8 parent f583165f6a926e9f27ff8d15c0e4b22e83f0d599 author Jon Loeliger Thu, 03 Aug 2006 16:27:57 -0500 committer Paul Mackerras Fri, 18 Aug 2006 10:02:45 +1000 [POWERPC] Add MPC8641 HPCN Device Tree Source file. As per list discussion, let's add device tree source files under powerpc/boot/dts. If nothing else, it is a starting point. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit f583165f6a926e9f27ff8d15c0e4b22e83f0d599 tree d4765340b1184a4a94565bbad197cb7b2488d6d1 parent 9a936a2e0526089194159eae31238e36b1c19e74 author Jon Loeliger Thu, 17 Aug 2006 08:42:35 -0500 committer Paul Mackerras Fri, 18 Aug 2006 09:50:16 +1000 [POWERPC] Convert to mac-address for ethernet MAC address data. Also accept "local-mac-address". However the old "address" is now obsolete, but accepted for backwards compatibility. It should be removed after all device trees have been converted to use "mac-address". Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 6e8fcbf64024f9056ba122abbb66554aa76bae5d tree 61fec2bd4815d30110dc2ba7da3b7578fb08a0d8 parent acd6e00b8e4db542cb6bc9ddfbb4e18bbe29ce4d author Alexey Kuznetsov Thu, 17 Aug 2006 16:44:46 -0700 committer David S. Miller Thu, 17 Aug 2006 16:44:46 -0700 [IPV4]: severe locking bug in fib_semantics.c Found in 2.4 by Yixin Pan . > When I read fib_semantics.c of Linux-2.4.32, write_lock(&fib_info_lock) = > is used in fib_release_info() instead of write_lock_bh(&fib_info_lock). = > Is the following case possible: a BH interrupts fib_release_info() while = > holding the write lock, and calls ip_check_fib_default() which calls = > read_lock(&fib_info_lock), and spin forever. Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit acd6e00b8e4db542cb6bc9ddfbb4e18bbe29ce4d tree f644e1ee2a5d85b1d680897105ad8f38a562cfc1 parent c7fa9d189e93877a1fa08ab00f230e0689125e45 author David L Stevens Thu, 17 Aug 2006 16:27:39 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:57 -0700 [MCAST]: Fix filter leak on device removal. This fixes source filter leakage when a device is removed and a process leaves the group thereafter. This also includes corresponding fixes for IPv6 multicast source filters on device removal. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit c7fa9d189e93877a1fa08ab00f230e0689125e45 tree 26aab5d6e79f8c25c89a8a70fa18c9c29819b8f0 parent d4274b51a5c8147b5341e15927368e75b632d297 author David S. Miller Tue, 15 Aug 2006 16:34:13 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:56 -0700 [NET]: Disallow whitespace in network device names. It causes way too much trouble and confusion in userspace. Signed-off-by: David S. Miller commit d4274b51a5c8147b5341e15927368e75b632d297 tree fbf4f8b5929bc89acada9b3cbfc588cf1f159e92 parent c0956bd25161bff45304d482cda51ca4b3b572f1 author Panagiotis Issaris Tue, 15 Aug 2006 16:01:07 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:55 -0700 [PPP]: handle kmalloc failures and convert to using kzalloc The PPP code contains two kmalloc()s followed by memset()s without handling a possible memory allocation failure. (Suggested by Joe Perches). And furthermore, conversions from kmalloc+memset to kzalloc. [akpm@osdl.org: fix error-path leak] [akpm@osdl.org: cleanups] [paulus@samba.org: don't add useless printk and cardmap_destroy calls] Signed-off-by: Panagiotis Issaris Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras Signed-off-by: David S. Miller commit c0956bd25161bff45304d482cda51ca4b3b572f1 tree d8cb679684f4a4e9a3cdc7808ed26cfd0f12b43b parent b9c6e3e96669ade31afd3a39f17393e577b609c5 author Ralf Hildebrandt Tue, 15 Aug 2006 02:12:43 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:54 -0700 [PKT_SCHED] cls_u32: Fix typo. Signed-off-by: Ralf Hildebrandt Signed-off-by: David S. Miller commit b9c6e3e96669ade31afd3a39f17393e577b609c5 tree a503803033ea92a516c41312f6bdac65e5bd80d9 parent 932f3772cf76cc1b1fd1538ceee3edba9bf2164f author Kevin Hilman Tue, 15 Aug 2006 02:02:33 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:53 -0700 [ATM]: Compile error on ARM atm_proc_exit() is declared as __exit, and thus in .exit.text. On some architectures (ARM) .exit.text is discarded at compile time, and since atm_proc_exit() is called by some other __init functions, it results in a link error. Signed-off-by: Kevin Hilman Signed-off-by: David S. Miller commit 932f3772cf76cc1b1fd1538ceee3edba9bf2164f tree f9ad57d1369359d30fbab271cb736519c0606e20 parent 2f8af120a159a843948749ea88bcacda9779b132 author Michael Chan Tue, 15 Aug 2006 01:39:36 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:52 -0700 [BNX2]: Convert to netdev_alloc_skb() Convert dev_alloc_skb() to netdev_alloc_skb() and increase default rx ring size to 255. The old ring size of 100 was too small. Update version to 1.4.44. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2f8af120a159a843948749ea88bcacda9779b132 tree e633037a72db856b8078e814e3451dd8f44c14de parent fb33f82568d32016b3b3c00819574f9526e52be3 author Michael Chan Tue, 15 Aug 2006 01:39:10 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:51 -0700 [BNX2]: Fix tx race condition. Fix a subtle race condition between bnx2_start_xmit() and bnx2_tx_int() similar to the one in tg3 discovered by Herbert Xu: CPU0 CPU1 bnx2_start_xmit() if (tx_ring_full) { tx_lock bnx2_tx() if (!netif_queue_stopped) netif_stop_queue() if (!tx_ring_full) update_tx_ring netif_wake_queue() tx_unlock } Even though tx_ring is updated before the if statement in bnx2_tx_int() in program order, it can be re-ordered by the CPU as shown above. This scenario can cause the tx queue to be stopped forever if bnx2_tx_int() has just freed up the entire tx_ring. The possibility of this happening should be very rare though. The following changes are made, very much identical to the tg3 fix: 1. Add memory barrier to fix the above race condition. 2. Eliminate the private tx_lock altogether and rely solely on netif_tx_lock. This eliminates one spinlock in bnx2_start_xmit() when the ring is full. 3. Because of 2, use netif_tx_lock in bnx2_tx_int() before calling netif_wake_queue(). 4. Add memory barrier to bnx2_tx_avail(). 5. Add bp->tx_wake_thresh which is set to half the tx ring size. 6. Check for the full wake queue condition before getting netif_tx_lock in tg3_tx(). This reduces the number of unnecessary spinlocks when the tx ring is full in a steady-state condition. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit fb33f82568d32016b3b3c00819574f9526e52be3 tree dea58578fe7ae7b0fd3f375983e5544cd9c1c03c parent bb699cbca0096aa3f5f750264ec0af080732375a author Jan "Yenya" Kasprzak Tue, 15 Aug 2006 01:33:50 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:50 -0700 [NET]: Terminology in ip-sysctl.txt this minor patch fixes the description of net.ipv4.tcp_mem sysctl in ip-sysctl.txt - the headline names the values "min, pressure, max", while the description uses the "low, pressure, high" values. Both tcp_rmem and tcp_wmem descriptions use the "min, pressure, max" values, so I have changed the tcp_mem to match this and not vice versa. Signed-off-by: Jan "Yenya" Kasprzak Signed-off-by: David S. Miller commit bb699cbca0096aa3f5f750264ec0af080732375a tree 4340b45f9750f7855abe937ff9c5c1427166e48a parent 640c41c77a96dbbfb74d40ae86ab75b759afb911 author Michal Ruzicka Tue, 15 Aug 2006 00:20:17 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:49 -0700 [IPV4]: Possible leak of multicast source filter sctructure There is a leak of a socket's multicast source filter list structure on closing a socket with a multicast source filter set on an interface that does not exist any more. Signed-off-by: Michal Ruzicka Acked-by: David L Stevens Signed-off-by: David S. Miller commit 640c41c77a96dbbfb74d40ae86ab75b759afb911 tree 58c7ae0097b2d5a2b724ffb36edcd3a3ab18ba05 parent deb47c66e12a645f7eec9b1c153c05ed47989439 author Ingo Molnar Tue, 15 Aug 2006 00:06:56 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:48 -0700 [IPV6] lockdep: annotate __icmpv6_socket Split off __icmpv6_socket's sk->sk_dst_lock class, because it gets used from softirqs, which is safe for __icmpv6_sockets (because they never get directly used via userspace syscalls), but unsafe for normal sockets. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Acked-by: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit deb47c66e12a645f7eec9b1c153c05ed47989439 tree 388b5f4f24bc74fc03fcf3d67f3ae1c65f356177 parent 855751125093f758871b70da2951d8b92b6368cc author Andrew Morton Tue, 15 Aug 2006 00:04:56 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:47 -0700 [NETFILTER]: xt_physdev build fix It needs netfilter_bridge.h for brnf_deferred_hooks Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 855751125093f758871b70da2951d8b92b6368cc tree 6c9e71da19a4fa164380c25c0d443f4eb965c917 parent 7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176 author Suresh Siddha Tue, 15 Aug 2006 00:03:01 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:47 -0700 [NET]: Fix potential stack overflow in net/core/utils.c On High end systems (1024 or so cpus) this can potentially cause stack overflow. Fix the stack usage. Signed-off-by: Suresh Siddha Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176 tree 09cf48c5f48bdee89b7a2579ba4c7b072ca842e9 parent 774bd8613d0188cda72408f8ffce258d73953cad author David S. Miller Mon, 14 Aug 2006 17:08:36 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:46 -0700 [VLAN]: Make sure bonding packet drop checks get done in hwaccel RX path. Since __vlan_hwaccel_rx() is essentially bypassing the netif_receive_skb() call that would have occurred if we did the VLAN decapsulation in software, we are missing the skb_bond() call and the assosciated checks it does. Export those checks via an inline function, skb_bond_should_drop(), and use this in __vlan_hwaccel_rx(). Signed-off-by: David S. Miller commit 9a936a2e0526089194159eae31238e36b1c19e74 tree fbc8063ccd2c78eeb135047f5a603b6f0d7b8959 parent e5c14ce118ab6a96afb2af5c4ec9727b03ab1936 author Olof Johansson Sun, 06 Aug 2006 20:51:25 -0500 committer Paul Mackerras Fri, 18 Aug 2006 07:23:29 +1000 [POWERPC] powerpc: Clear HID0 attention enable on PPC970 at boot time Clear HID0[en_attn] at CPU init time on PPC970. Closes CVE-2006-4093. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit e5c14ce118ab6a96afb2af5c4ec9727b03ab1936 tree 8533e1253717881dc93bca17537d4ff9418fabdc parent 83db3dde2604d48e30a468c82da163dd1a8602b3 author Benjamin Herrenschmidt Thu, 17 Aug 2006 03:59:27 +0200 committer Paul Mackerras Thu, 17 Aug 2006 16:41:11 +1000 [POWERPC] Fix irq radix tree remapping typo The code for using the radix tree for reverse mapping of interrupts has a typo that causes it to create incorrect mappings if the software and hardware numbers happen to be different. This would, among others, cause the IDE interrupt to fail on js20's. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 83db3dde2604d48e30a468c82da163dd1a8602b3 tree 6955ecdc6b0901da808686a2e9e07a3646008aac parent b6f35b4966e0ae59cec45e5292b100698d12dc5f author Ananth N Mavinakayanahalli Fri, 11 Aug 2006 17:01:34 +0530 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] kprobes: Fix possible system crash during out-of-line single-stepping - On archs that have no-exec support, we vmalloc() a executable scratch area of PAGE_SIZE and divide it up into an array of slots of maximum instruction size for that arch - On a kprobe registration, the original instruction is copied to the first available free slot, so if multiple kprobes are registered, chances are, they get contiguous slots - On POWER4, due to not having coherent icaches, we could hit a situation where a probe that is registered on one processor, is hit immediately on another. This second processor could have fetched the stream of text from the out-of-line single-stepping area *before* the probe registration completed, possibly due to an earlier (and a different) kprobe hit and hence would see stale data at the slot. Executing such an arbitrary instruction lead to a problem as reported in LTC bugzilla 23555. The correct solution is to call flush_icache_range() as soon as the instruction is copied for out-of-line single-stepping, so the correct instruction is seen on all processors. Thanks to Will Schmidt who tracked this down. Signed-off-by: Ananth N Mavinakayanahalli Acked-by: Will Schmidt Signed-off-by: Paul Mackerras commit b6f35b4966e0ae59cec45e5292b100698d12dc5f tree 5ff3b2832c1c3eebbef699df710068ab106ab2db parent 47585d8f5dea10dea49c948f1fb13ef7632409c7 author Michael Ellerman Wed, 05 Jul 2006 14:39:43 +1000 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] Make crash.c work on 32-bit and 64-bit To compile kexec on 32-bit we need a few more bits and pieces. Rather than add empty definitions, we can make crash.c work on 32-bit, with only a couple of kludges. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 47585d8f5dea10dea49c948f1fb13ef7632409c7 tree d9386ca930b7470e64f3d60076e3cf72f1b22c75 parent 90bdde362cc506173c1d18b8f516b18e5b228e96 author Michael Ellerman Wed, 05 Jul 2006 14:39:42 +1000 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] Move some kexec logic into machine_kexec.c We're missing a few functions for kexec to compile on 32-bit. There's nothing really 64-bit specific about the 64-bit versions, so make them generic rather than adding empty definitions for 32-bit. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 90bdde362cc506173c1d18b8f516b18e5b228e96 tree 38d9739db7292724c4577790483d7f551bec74fc parent eac8392f9591b359847b8a6abb75ca60967bcecd author Will Schmidt Tue, 08 Aug 2006 09:40:00 -0500 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] update {g5,iseries,pseries}_defconfigs Updating the defconfigs for iseries, pseries, and G5. Sticking with the defaults, with the following exceptions: I've turned off HW_RANDOM for all three configs. For G5, I've enabled SND_AOA and friends as modules; this includes the FABRIC_LAYOUT, ONYX, TAS, TOONIE and SOUNDBUS* config options. Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit eac8392f9591b359847b8a6abb75ca60967bcecd tree b4f834392fe4021bbace3c0f58ad01581cfd844e parent 81b73dd92b97423b8f5324a59044da478c04f4c4 author David Wilder Thu, 29 Jun 2006 15:17:30 -0700 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] Make secondary CPUs call into kdump on reset exception In the case of a system hang, the user will invoke soft-reset to initiate the kdump boot. If xmon is enabled, the CPU(s) enter into the xmon debugger. Unfortunately, the secondary CPU(s) will return to the hung state when they exit from the debugger (returned from die() -> system_reset_exception()). This causes a problem in kdump since the hung CPU(s) will not respond to the IPI sent from kdump. This patch fixes the issue by calling crash_kexec_secondary() directly from system_reset_exception() without returning to the previous state. These secondary CPUs wait 5ms until the kdump boot is started by the primary CPU. In the case we exited from the debugger to "recover" (command 'x' in xmon) the primary and the secondary CPUs will all return from die() -> system_reset_exception() ->crash_kexec_secondary() wait 5ms, then return to the previous state. A kdump boot is not started in this case. Signed-off-by: Haren Myneni Signed-off-by: David Wilder Signed-off-by: Paul Mackerras commit d68909f4c3eee09c13d4e5c86512c6c075553dbd tree 4153c598662ea952903329c6eced0acbbfcfb7b6 parent b5240b32b9b2b75917c478d768191862a2b190cc author Len Brown Wed, 16 Aug 2006 19:16:58 -0400 committer Len Brown Wed, 16 Aug 2006 19:23:00 -0400 ACPI: avoid irqrouter_resume might_sleep oops on resume from S4 __might_sleep+0x8e/0x93 acpi_os_wait_semaphore+0x50/0xa3 acpi_ut_acquire_mutex+0x28/0x6a acpi_ns_get_node+0x46/0x88 acpi_ns_evaluate+0x2d/0xfc acpi_rs_set_srs_method_data+0xc5/0xe1 acpi_set_current_resources+0x31/0x3f acpi_pci_link_set+0xfc/0x1a5 irqrouter_resume+0x48/0x5f and __might_sleep+0x8e/0x93 kmem_cache_alloc+0x2a/0x8f acpi_evaluate_integer+0x32/0x96 acpi_bus_get_status+0x30/0x84 acpi_pci_link_set+0x12a/0x1a5 irqrouter_resume+0x48/0x5f http://bugzilla.kernel.org/show_bug.cgi?id=6810 Signed-off-by: Len Brown commit 5672bde6355f2d12c49df1eec083d25afe489063 tree 9e4713a72b26b0b92d2a381a65dbdc83abd0e621 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Handle X Mon, 14 Aug 2006 22:37:27 -0700 committer Len Brown Wed, 16 Aug 2006 18:08:06 -0400 ACPI: hotkey.c fixes, fix for potential crash of hotkey.c While going through the code, I found out some memory leaks and potential crashes in drivers/acpi/hotkey.c Please find the patch to fix them. This patch does the following, 1. Fixes memory leaks in error paths of hotkey_write_config 2. Fixes freeing unallocated pointers in the error paths of hotkey_write_config 3. Uses a loop instead of linear searching for parsing the userspace input in get_params 4. Uses array of char * instead of passing 4 pointer parameters explicitly into the init_{poll_}hotkey_* static functions Signed-off-by: Andrew Morton Acked-by: Luming Yu Signed-off-by: Len Brown commit 4e6e6504a4572dee3afcb0925ce92ad559e1e0db tree 9c1d2798c5db07c4df7cddc5db8f12c4c8037ca3 parent 9f737633e6ee54fc174282d49b2559bd2208391d author William Morrrow Mon, 14 Aug 2006 22:37:31 -0700 committer Len Brown Wed, 16 Aug 2006 17:59:05 -0400 ACPI: Handle BIOS that resumes from S3 to suspend routine rather than resume vector A BIOS has been found that resumes from S3 to the routine that invoked suspend, ignoring the resume vector. This appears to the OS as a failed S3 attempt. This same system suspend/resume's properly with Windows. It is possible to invoke the protected mode register restore routine (which would normally restore the sysenter registers) when the BIOS returns from S3. This has no effect on a correctly running system and repairs the damage from the deviant BIOS. Signed-off-by: William Morrow Signed-off-by: Jordan Crouse Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 774bd8613d0188cda72408f8ffce258d73953cad tree b5f2eaeecd41c868d83d6aa443da776852cd4c95 parent 223ddcea898940b0b02bd6e624dbba3507c97365 parent c9eca0b91015bc685c2f35a50efc63d73fdf943a author Greg Kroah-Hartman Wed, 16 Aug 2006 12:41:16 -0700 committer Greg Kroah-Hartman Wed, 16 Aug 2006 12:41:16 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 commit c9eca0b91015bc685c2f35a50efc63d73fdf943a tree 0922f5cbb51d2dfca8ff14df625beadf734ec269 parent 9ee4e3365dd0dab4c1e02fe44dc08a223b826c72 author Sam Ravnborg Wed, 16 Aug 2006 21:14:08 +0200 committer Sam Ravnborg Wed, 16 Aug 2006 21:14:08 +0200 kbuild: correct assingment to CFLAGS with CROSS_COMPILE Some architectures change $CC in arch/$(ARCH)/Makefile mips is one example. That have impact on what options are supported by gcc so move all $(call cc-option, ...) after include of arch specific Makefile. Signed-off-by: Sam Ravnborg commit acaea9ee460d0ba5a14f0066ba26cfa43dd5fdf3 tree 9dcc7fdf6038d47097924f8173d94a170d6377f3 parent a19aa5c5fdda8b556ab238177ee27c5ef7873c94 author Jack Morgenstein Tue, 15 Aug 2006 17:20:50 +0300 committer Roland Dreier Wed, 16 Aug 2006 09:54:47 -0700 IB/core: Fix SM LID/LID change with client reregister set After commit 12bbb2b7be7f5564952ebe0196623e97464b8ac5, when SM LID change or LID change MAD also has a client reregistration bit set, only CLIENT_REREGISTER event is generated. As a result, the sa_query module and the cache module don't update the port information, and ULPs (e.g. IPoIB) stop working. This is the regression we observe as compared to 2.6.17. Rather than generate multiple events (which would have negative performance impact), let us simply let cache and SA query respond to reregister event in the same way as to LID and SM change events. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 223ddcea898940b0b02bd6e624dbba3507c97365 tree 3c88d52453521b143848fed844142ac5ea46fe51 parent ca412cc992c3226239dd3bf896681bbf30e1b444 parent 3e03a2fcb2c031062f9bf698ce999b77cd80aec4 author Greg Kroah-Hartman Wed, 16 Aug 2006 08:51:04 -0700 committer Greg Kroah-Hartman Wed, 16 Aug 2006 08:51:04 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 commit 3e03a2fcb2c031062f9bf698ce999b77cd80aec4 tree a65228d2f8c2466410b2ae5aa26f0637343fd456 parent b18a60e7c2a7f2a17dbd57885621a42d546e2f7d author Heiko Carstens Wed, 16 Aug 2006 13:49:37 +0200 committer Martin Schwidefsky Wed, 16 Aug 2006 13:49:37 +0200 [S390] kernel page table allocation. Don't waste DMA capable pages for identity mapping page tables. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b18a60e7c2a7f2a17dbd57885621a42d546e2f7d tree ca41788f01ae5d6c268a1b7992682ea9de0ea563 parent 2f6c55fc3109bcfa1bb1a112c825e07212c20f37 author Peter Oberparleiter Wed, 16 Aug 2006 13:49:33 +0200 committer Martin Schwidefsky Wed, 16 Aug 2006 13:49:33 +0200 [S390] inaccessible PAV alias devices on LPAR. In some situations PAV alias devices on LPAR are not accessible. The initialization procedure required to enable access to PAV alias devices has to be performed per storage server subsystem and not only once per storage server. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 2f6c55fc3109bcfa1bb1a112c825e07212c20f37 tree 9ad93064df1939b5167b1240384da368c7eae410 parent d0710c7c9eea2145a0614f39dbe9dc8cb4ae14da author Heiko Carstens Wed, 16 Aug 2006 13:49:27 +0200 committer Martin Schwidefsky Wed, 16 Aug 2006 13:49:27 +0200 [S390] dasd slab cache alignment. The dasd_page_cache should return page addresses and therefore the cache must be created with an alignment of PAGE_SIZE. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ca412cc992c3226239dd3bf896681bbf30e1b444 tree 5b5fd9becdfeda652173ada495b7738988211c7b parent e0e92632715f08dddeddb72b76e04c20126e1f67 parent 2621e2a155140b01c6ff57b3863cda2922c2c8bd author Greg Kroah-Hartman Wed, 16 Aug 2006 01:38:39 -0700 committer Greg Kroah-Hartman Wed, 16 Aug 2006 01:38:39 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog commit b5240b32b9b2b75917c478d768191862a2b190cc tree 19b45bf221d7bb6ef19eca93d801906936b87952 parent 07dd4855e7fffeb50565826e5e736509ee8f6129 author Kristen Carlson Accardi Wed, 26 Jul 2006 13:32:00 -0400 committer Len Brown Wed, 16 Aug 2006 01:00:07 -0400 ACPIPHP: allow acpiphp to build without ACPI_DOCK Change the build options for acpiphp so that it may build without being dependent on the ACPI_DOCK option, but yet does not allow the option of acpiphp being built-in when dock is built as a module. This does not change the previous patch for ACPI_IBM_DOCK Kconfig. For the following matrix of config options, I built an i386 kernel. Dock acpiphp should it build? confirmed y y y y y n y y y m y y m y no - acpiphp should acpiphp was convert to m converted to m m n y y m m y y n y y y n n y y n m y y Signed-off-by: Anil S Keshavamurthy Signed-off-by: Kristen Carlson Accardi Signed-off-by: Len Brown commit 07dd4855e7fffeb50565826e5e736509ee8f6129 tree 5202c3ac0f0db51a87db3e6649896cae01a020eb parent e9a315bcae3b9e0c54fb68ef90d0095956314480 author Yasunori Goto Mon, 14 Aug 2006 22:37:32 -0700 committer Len Brown Wed, 16 Aug 2006 00:29:26 -0400 ACPI: memory hotplug: remove useless message at boot time This is to remove noisy useless message at boot. The message is a ton of "ACPI Exception (acpi_memory-0492): AE_ERROR, handle is no memory device" In my emulation, number of memory devices are not so many (only 6), but, this messages are displayed 114 times. It is showed by acpi_memory_register_notify_handler() which is called by acpi_walk_namespace(). acpi_walk_namespace() parses all of ACPI's namespace and execute acpi_memory_register_notify_handler(). So, it is called for all of the device which is defined in namespace. If the parsing device is not memory, acpi_memhotplug ignores it due to "no match" and will parse next device. This is normal route, not an exception. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit e9a315bcae3b9e0c54fb68ef90d0095956314480 tree 607216758ddaa8927e9a649a21c2c8b5d50c1713 parent 7daef60721e03809c7e5f8aa8491df4190f6b56f author Randy Dunlap Mon, 14 Aug 2006 22:37:24 -0700 committer Len Brown Tue, 15 Aug 2006 23:32:24 -0400 ACPI: verbose on kset/kobject_register errors Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7daef60721e03809c7e5f8aa8491df4190f6b56f tree 62bd2fc5dadc3d0497cb8ba4ff095bd9fb8c36fc parent b20d2aeb0ad322cbe7fd9120acae6118231b17a3 author Randy Dunlap Mon, 14 Aug 2006 22:37:24 -0700 committer Len Brown Tue, 15 Aug 2006 23:27:38 -0400 ACPI: add message if firmware_register() init fails Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit b20d2aeb0ad322cbe7fd9120acae6118231b17a3 tree c74ff2ae136371b83a673c0aaf297cdc609e1b80 parent 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe author Len Brown Tue, 15 Aug 2006 23:21:37 -0400 committer Len Brown Tue, 15 Aug 2006 23:21:37 -0400 ACPI: skip smart battery init when acpi=off Signed-off-by: Len Brown commit 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe tree 41fb896080563444bfdf047d56946d775b4f74a6 parent 0ee6a17389ceef65f1a86c38872fa98f08489022 author Pavel Machek Mon, 14 Aug 2006 22:37:22 -0700 committer Len Brown Tue, 15 Aug 2006 23:16:43 -0400 ACPI: fix boot with acpi=off Fix acpi_ac/battery boot with acpi=off Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit e0e92632715f08dddeddb72b76e04c20126e1f67 tree 4b596e9b32a58f7c2db6e8a123f4d02007c539c0 parent 80914d97aa0c61fbfd8eadd120c863b6229f0809 author Hans de Goede Tue, 15 Aug 2006 12:09:27 +0200 committer Greg Kroah-Hartman Tue, 15 Aug 2006 12:53:09 -0700 [PATCH] PATCH: 1 line 2.6.18 bugfix: modpost-64bit-fix.patch There is a small but annoying bug in scripts/mod/file2alias.c which causes it to generate invalid aliases for input devices on 64 bit archs. This causes joydev.ko to not be automaticly loaded when inserting a joystick, resulting in a non working joystick (for the average user). In scripts/mod/file2alias.c is the following code for generating the input aliases: static void do_input(char *alias, kernel_ulong_t *arr, unsigned int min, unsigned int max) { unsigned int i; for (i = min; i < max; i++) if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG))) sprintf(alias + strlen(alias), "%X,*", i); } On 32 bits systems, this correctly generates "0,*" for the first alias, "8,*" for the second etc. However on 64 bits it generates: "0,*20,*" resp "8,*28,*" Notice how it adds 20 + first entry (hex) ! to the list of hex codes, which is 32 more then the first entry, thus is because the bit test above wraps at 32 bits instead of 64. scripts/mod/file2alias.c, line 379 reads: if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG))) That should be: if (arr[i / BITS_PER_LONG] & (1L << (i%BITS_PER_LONG))) Notice the added 'L' after the 1, otherwise that is an 32 bit int instead of a 64 bit long, and when that int gets shifted >= 32 times, appearantly the number by which to shift is wrapped at 5 bits ( % 32) causing it to test a bit 32 bits too low. The patch below makes the nescesarry 1 char change :) Signed-off-by: Hans de Goede Acked-by: Rusty Russell Signed-off-by: Greg Kroah-Hartman commit 80914d97aa0c61fbfd8eadd120c863b6229f0809 tree 4d4d08a8ccbfcdabb40cc457badfd053056a7bdd parent 74361cb6828398a96167b3234e186fbd731e5f30 parent 883d4cae4a2b01a05193cf2665c77b7489a8b6a0 author Greg Kroah-Hartman Tue, 15 Aug 2006 12:31:36 -0700 committer Greg Kroah-Hartman Tue, 15 Aug 2006 12:31:36 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 commit 2621e2a155140b01c6ff57b3863cda2922c2c8bd tree e66b4cffbd870e4e9244a4b48442b4908255a9ff parent 9f737633e6ee54fc174282d49b2559bd2208391d author Matt LaPlante Wed, 05 Jul 2006 01:20:51 +0000 committer Wim Van Sebroeck Tue, 15 Aug 2006 11:17:22 +0200 [WATCHDOG] Kconfig typos fix. Three typos in drivers/char/watchdog/Kconfig... Signed-off-by: Matt LaPlante Signed-off-by: Wim Van Sebroeck commit 74361cb6828398a96167b3234e186fbd731e5f30 tree 4455618d0f6c8f4e17484180a8f69b529c04076c parent 1d7ea7324ae7a59f8e17e4ba76a2707c1e6f24d2 author Trond Myklebust Mon, 14 Aug 2006 08:54:48 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 13:10:59 -0700 [PATCH] fcntl(F_SETSIG) fix fcntl(F_SETSIG) no longer works on leases because lease_release_private_callback() gets called as the lease is copied in order to initialise it. The problem is that lease_alloc() performs an unnecessary initialisation, which sets the lease_manager_ops. Avoid the problem by allocating the target lease structure using locks_alloc_lock(). Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1d7ea7324ae7a59f8e17e4ba76a2707c1e6f24d2 tree 902b646ed70af86481a77a67582b79e67264a481 parent 9b41ea7289a589993d3daabc61f999b4147872c4 author Alexander Zarochentsev Sun, 13 Aug 2006 23:24:27 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] fuse: fix error case in fuse_readpages Don't let fuse_readpages leave the @pages list not empty when exiting on error. [akpm@osdl.org: kernel-doc fixes] Signed-off-by: Alexander Zarochentsev Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9b41ea7289a589993d3daabc61f999b4147872c4 tree 35a79670ca4493832f1da026a047e3fc9eec0910 parent 2b25742556b1a351ce4821f6feddcba23bdd930b author Andrew Morton Sun, 13 Aug 2006 23:24:26 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] workqueue: remove lock_cpu_hotplug() Use a private lock instead. It protects all per-cpu data structures in workqueue.c, including the workqueues list. Fix a bug in schedule_on_each_cpu(): it was forgetting to lock down the per-cpu resources. Unfixed long-standing bug: if someone unplugs the CPU identified by `singlethread_cpu' the kernel will get very sick. Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2b25742556b1a351ce4821f6feddcba23bdd930b tree f3edf7f05895f61c6ef366caa8af1a83b6f76905 parent e579dcbf23604cb33c08b5c3c3ac06ca36e7c683 author Michal Januszewski Sun, 13 Aug 2006 23:24:26 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] fbdev: include backlight.h only when __KERNEL__ is defined linux/backlight.h pulls in header files (eg. ioport.h) that break compilation of userspace programs. To solve the problem, only include backlight.h in fb.h if compiling kernel stuff. Signed-off-by: Michal Januszewski Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e579dcbf23604cb33c08b5c3c3ac06ca36e7c683 tree 293581684fc47260a4610e4a77510b459346e2aa parent 6997a6faaa129a1c91775f7344c8d371a05178ea author john stultz Sun, 13 Aug 2006 23:24:24 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] futex_handle_fault always fails We found this issue last week w/ the -RT kernel, but it seems the same issue is in mainline as well. Basically it is possible for futex_unlock_pi to return without actually freeing the lock. This is due to buggy logic in the use of futex_handle_fault() and its attempt argument in a failure case. Looking at futex.c the logic is as follows: 1) In futex_unlock_pi() we start w/ ret=0 and we go down to the first futex_atomic_cmpxchg_inatomic(), where we find uval==-EFAULT. We then jump to the pi_faulted label. 2) From pi_faulted: We increment attempt, unlock the sem and hit the retry label. 3) From the retry label, with ret still zero, we again hit EFAULT on the first futex_atomic_cmpxchg_inatomic(), and again goto the pi_faulted label. 4) Again from pi_faulted: we increment attempt and enter the conditional, where we call futex_handle_fault. 5) futex_handle_fault fails, and we goto the out_unlock_release_sem label. 6) From out_unlock_release_sem we return, and since ret is still zero, we return without error, while never actually unlocking the lock. Issue #1: at the first futex_atomic_cmpxchg_inatomic() we should probably be setting ret=-EFAULT before jumping to pi_faulted: However in our case this doesn't really affect anything, as the glibc we're using ignores the error value from futex_unlock_pi(). Issue #2: Look at futex_handle_fault(), its first conditional will return -EFAULT if attempt is >= 2. However, from the "if(attempt++) futex_handle_fault(attempt)" logic above, we'll *never* call futex_handle_fault when attempt is less then two. So we never get a chance to even try to fault the page in. The following patch addresses these two issues by 1) Always setting ret to -EFAULT if futex_handle_fault fails, and 2) Removing the = in futex_handle_fault's (attempt >= 2) check. I'm really not sure this is the right fix, but wanted to bring it up so folks knew the issue is alive and well in the current -git tree. From looking at the git logs the logic was first introduced (then later copied to other places) in the following commit almost a year ago: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=4732efbeb997189d9f9b04708dc26bf8613ed721;hp=5b039e681b8c5f30aac9cc04385cc94be45d0823 Cc: Rusty Russell Cc: Ingo Molnar Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6997a6faaa129a1c91775f7344c8d371a05178ea tree d1dbf57afc7d561620ad1b192ae031fd234b085a parent 012c437d03cb299814e58ac8d574f7510f5989a5 author Kirill Korotaev Sun, 13 Aug 2006 23:24:23 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] sys_getppid oopses on debug kernel sys_getppid() optimization can access a freed memory. On kernels with DEBUG_SLAB turned ON, this results in Oops. As Dave Hansen noted, this optimization is also unsafe for memory hotplug. So this patch always takes the lock to be safe. [oleg@tv-sign.ru: simplifications] Signed-off-by: Kirill Korotaev Cc: Cc: Dave Hansen Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 012c437d03cb299814e58ac8d574f7510f5989a5 tree 2e7eb5c22549c80b797dd4e99bc4c2c55e64f254 parent 485311a23c72c87332f9a55ce25e650e40ae3fc7 author Horms Sun, 13 Aug 2006 23:24:22 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] Change panic_on_oops message to "Fatal exception" Previously the message was "Fatal exception: panic_on_oops", as introduced in a recent patch whith removed a somewhat dangerous call to ssleep() in the panic_on_oops path. However, Paul Mackerras suggested that this was somewhat confusing, leadind people to believe that it was panic_on_oops that was the root cause of the fatal exception. On his suggestion, this patch changes the message to simply "Fatal exception". A suitable oops message should already have been displayed. Signed-off-by: Simon Horman Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 485311a23c72c87332f9a55ce25e650e40ae3fc7 tree 5c70793c578d4c4f70b7cebef68bc71febb1c1f8 parent 657b3010d8f8a72195dfcbe63040127d596f0b14 author Michal Miroslaw Sun, 13 Aug 2006 23:24:20 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] dm: BUG/OOPS fix Fix BUG I tripped on while testing failover and multipathing. BUG shows up on error path in multipath_ctr() when parse_priority_group() fails after returning at least once without error. The fix is to initialize m->ti early - just after alloc()ing it. BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000 printing eip: c027c3d2 *pde = 00000000 Oops: 0000 [#3] Modules linked in: qla2xxx ext3 jbd mbcache sg ide_cd cdrom floppy CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00010202 (2.6.17.3 #1) EIP is at dm_put_device+0xf/0x3b eax: 00000001 ebx: ee4fcac0 ecx: 00000000 edx: ee4fcac0 esi: ee4fc4e0 edi: ee4fc4e0 ebp: 00000000 esp: c5db3e78 ds: 007b es: 007b ss: 0068 Process multipathd (pid: 15912, threadinfo=c5db2000 task=ef485a90) Stack: ec4eda40 c02816bd ee4fc4c0 00000000 f7e89498 f883e0bc c02816f6 f7e89480 f7e8948c c0281801 ffffffea f7e89480 f883e080 c0281ffe 00000001 00000000 00000004 dfe9cab8 f7a693c0 f883e080 f883e0c0 ca4b99c0 c027c6ee 01400000 Call Trace: free_pgpaths+0x31/0x45 free_priority_group+0x25/0x2e free_multipath+0x35/0x67 multipath_ctr+0x123/0x12d dm_table_add_target+0x11e/0x18b populate_table+0x8a/0xaf table_load+0x52/0xf9 ctl_ioctl+0xca/0xfc table_load+0x0/0xf9 do_ioctl+0x3e/0x43 vfs_ioctl+0x16c/0x178 sys_ioctl+0x48/0x60 syscall_call+0x7/0xb Code: 97 f0 00 00 00 89 c1 83 c9 01 80 e2 01 0f 44 c1 88 43 14 8b 04 24 59 5b 5e 5f 5d c3 53 89 c1 89 d3 ff 4a 08 0f 94 c0 84 c0 74 2a <8b> 01 8b 10 89 d8 e8 f6 fb ff ff 8b 03 8b 53 04 89 50 04 89 02 EIP: [] dm_put_device+0xf/0x3b SS:ESP 0068:c5db3e78 Signed-off-by: Michal Miroslaw Acked-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 657b3010d8f8a72195dfcbe63040127d596f0b14 tree e3cd79a634949a01955be6e53f84b78b4f1b0d66 parent 3773dc92055f219c2f2403f9de774b8ad41a9214 author Andrew Morton Sun, 13 Aug 2006 23:24:19 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] panic.c build fix kernel/panic.c: In function 'add_taint': kernel/panic.c:176: warning: implicit declaration of function 'debug_locks_off' Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3773dc92055f219c2f2403f9de774b8ad41a9214 tree 621406999c6bafdf635a8425be2e67ba8e894e22 parent 95f8797f42b058333d1e6f0d1dcd8edf5dc6c244 author Jan Blunck Sun, 13 Aug 2006 23:24:19 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] fix hrtimer percpu usage typo The percpu variable is used incorrectly in switch_hrtimer_base(). Signed-off-by: Jan Blunck Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 95f8797f42b058333d1e6f0d1dcd8edf5dc6c244 tree f0f0cc374b0d0d884210f3cdbd0774efe3b79fe9 parent 1725cd0ae07bb31f68803edcc5bdc99952c7d2f4 author Dan Bastone Sun, 13 Aug 2006 23:24:18 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] initialize parts of udf inode earlier in create Eric says: > I saw an oops down this path when trying to create a new file on a UDF > filesystem which was internally marked as readonly, but mounted rw: > > udf_create > udf_new_inode > new_inode > alloc_inode > udf_alloc_inode > udf_new_block > returns EIO due to readonlyness > iput (on error) I ran into the same issue today, but when listing a directory with invalid/corrupt entries: udf_lookup udf_iget get_new_inode_fast alloc_inode udf_alloc_inode __udf_read_inode fails for any reason iput (on error) ... The following patch to udf_alloc_inode() should take care of both (and other similar) cases, but I've only tested it with udf_lookup(). Signed-off-by: Dan Bastone Cc: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1725cd0ae07bb31f68803edcc5bdc99952c7d2f4 tree ef5ab0a139e3458df0c2c4bbeb5ff977a6dfd31f parent b64ef8afa58f397e1eaba2bd9ecaa6812064d464 author Andrew Morton Sun, 13 Aug 2006 23:24:17 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] adfs error message fix Don't use NULL as a printf control string. Fixes bug #6889. Cc: Ralph Corderoy Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b64ef8afa58f397e1eaba2bd9ecaa6812064d464 tree 2e8a312cbf4ff9df84ecee3ea2eca5c0c349d9a2 parent e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 author Edgar Hucek Sun, 13 Aug 2006 23:24:16 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] add imacfb documentation and detection Add basic Machine detection to imacfb and some Ducumentation bits for imacfb. Signed-off-by: Edgar Hucek Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 09e590e5d5a93f2eaa748a89c623258e6bad1648 tree b86f9ee242111dccb2216f75914554cf2a5f9009 parent 8d3d35b4e20dc2e678fc7cb51165905b5a32fb76 author Lennert Buytenhek Sat, 12 Aug 2006 10:55:07 +0200 committer Jeff Garzik Mon, 14 Aug 2006 13:58:58 -0400 [PATCH] smc91x: disable DMA mode on the logicpd pxa270 Enabling PXA DMA for the smc91x on the logicpd pxa270 produces unacceptable interference with the TFT panel, so disable it. Also delete the lpd270 versions of the SMC_{in,out}[bl]() macros, as they aren't used, since the board only supports 16bit accesses. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik commit e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 tree 7313e7994ed8dbeb47ca454ee7c53d45e040738d parent dcb7cd97f133f7cfbd181149a1e60215a869f895 author Herbert Xu Sun, 13 Aug 2006 20:12:58 -0700 committer David S. Miller Sun, 13 Aug 2006 20:12:58 -0700 [INET]: Use pskb_trim_unique when trimming paged unique skbs The IPv4/IPv6 datagram output path was using skb_trim to trim paged packets because they know that the packet has not been cloned yet (since the packet hasn't been given to anything else in the system). This broke because skb_trim no longer allows paged packets to be trimmed. Paged packets must be given to one of the pskb_trim functions instead. This patch adds a new pskb_trim_unique function to cover the IPv4/IPv6 datagram output path scenario and replaces the corresponding skb_trim calls with it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit dcb7cd97f133f7cfbd181149a1e60215a869f895 tree 73e600aa19051981a566ad55ca5fa6f9acec4f7a parent 0eff66e625306a794ecba4b29ed12f7a147ce219 author Mark Huang Sun, 13 Aug 2006 18:57:54 -0700 committer David S. Miller Sun, 13 Aug 2006 18:57:54 -0700 [NETFILTER]: ulog: fix panic on SMP kernels Fix kernel panic on various SMP machines. The culprit is a null ub->skb in ulog_send(). If ulog_timer() has already been scheduled on one CPU and is spinning on the lock, and ipt_ulog_packet() flushes the queue on another CPU by calling ulog_send() right before it exits, there will be no skbuff when ulog_timer() acquires the lock and calls ulog_send(). Cancelling the timer in ulog_send() doesn't help because it has already been scheduled and is running on the first CPU. Similar problem exists in ebt_ulog.c and nfnetlink_log.c. Signed-off-by: Mark Huang Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0eff66e625306a794ecba4b29ed12f7a147ce219 tree 2f6cfe4d4c6305ccf1c0e942865e8753959a27a4 parent 7ee66fcb94cb8be77d5f34cce7d315d11759f9c1 author Patrick McHardy Sun, 13 Aug 2006 18:57:28 -0700 committer David S. Miller Sun, 13 Aug 2006 18:57:28 -0700 [NETFILTER]: {arp,ip,ip6}_tables: proper error recovery in init path Neither of {arp,ip,ip6}_tables cleans up behind itself when something goes wrong during initialization. Noticed by Rennie deGraaf Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7ee66fcb94cb8be77d5f34cce7d315d11759f9c1 tree b42e1a84e1f75d85ad12cfc2b90dbf8a4c6a7447 parent d49c73c729e2ef644558a1f441c044bfacdc9744 author Stephen Hemminger Sun, 13 Aug 2006 18:56:26 -0700 committer David S. Miller Sun, 13 Aug 2006 18:56:26 -0700 [LLC]: multicast receive device match Fix from Aji_Srinivas@emc.com, STP packets are incorrectly received on all LLC datagram sockets, whichever interface they are bound to. The llc_sap datagram receive logic sends packets with a unicast destination MAC to one socket bound to that SAP and MAC, and multicast packets to all sockets bound to that SAP. STP packets are multicast, and we do need to know on which interface they were received. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d49c73c729e2ef644558a1f441c044bfacdc9744 tree db35cd20d57fe5d9a7fcac5f40539902b6abbdf9 parent 1c7628bd7a458faf7c96ef521f6d3a5ea9b106b8 author David S. Miller Sun, 13 Aug 2006 18:55:53 -0700 committer David S. Miller Sun, 13 Aug 2006 18:55:53 -0700 [IPSEC]: Validate properly in xfrm_dst_check() If dst->obsolete is -1, this is a signal from the bundle creator that we want the XFRM dst and the dsts that it references to be validated on every use. I misunderstood this intention when I changed xfrm_dst_check() to always return NULL. Now, when we purge a dst entry, by running dst_free() on it. This will set the dst->obsolete to a positive integer, and we want to return NULL in that case so that the socket does a relookup for the route. Thus, if dst->obsolete<0, let stale_bundle() validate the state, else always return NULL. In general, we need to do things more intelligently here because we flush too much state during rule changes. Herbert Xu has some ideas wherein the key manager gives us some help in this area. We can also use smarter state management algorithms inside of the kernel as well. Signed-off-by: David S. Miller commit 1c7628bd7a458faf7c96ef521f6d3a5ea9b106b8 tree 45c4a21ee032a813df08dd4e4dc47b0a14fa571d parent 97c802a113989800430a981b6f36b14c62163d37 author Patrick McHardy Sun, 13 Aug 2006 18:06:02 -0700 committer David S. Miller Sun, 13 Aug 2006 18:06:02 -0700 [NETFILTER]: xt_hashlimit: fix limit off-by-one Hashlimit doesn't account for the first packet, which is inconsistent with the limit match. Reported by ryan.castellucci@gmail.com, netfilter bugzilla #500. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 97c802a113989800430a981b6f36b14c62163d37 tree 92dad3b2bb31469531c6a6f2c8bc2a3bba2f861a parent 18b6fe64d4d1f6e0a2c71429a5e5074f43e29203 author Phil Oester Sun, 13 Aug 2006 18:05:35 -0700 committer David S. Miller Sun, 13 Aug 2006 18:05:35 -0700 [NETFILTER]: xt_string: fix negation The xt_string match is broken with ! negation. This resolves a portion of netfilter bugzilla #497. Signed-off-by: Phil Oester Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 18b6fe64d4d1f6e0a2c71429a5e5074f43e29203 tree 32d7c7f7a3fc82c5478f129f52105c1c020df75a parent f54fa84dda211f68f65002efa44142207c886c79 author David S. Miller Sun, 13 Aug 2006 18:05:09 -0700 committer David S. Miller Sun, 13 Aug 2006 18:05:09 -0700 [TCP]: Fix botched memory leak fix to tcpprobe_read(). Somehow I clobbered James's original fix and only my subsequent compiler warning change went in for that changeset. Get the real fix in there. Noticed by Jesper Juhl. Signed-off-by: David S. Miller commit a0c5a64552e3c57d7f9eb593c6ce21a285ac86b4 tree 3bae124a99ac0a805bfa61a490a6d7ae76f53f2b parent 574dc0abab6650c5371df15ac708e48fa25bed89 author Yoav Steinberg Sun, 13 Aug 2006 14:17:12 +0100 committer Russell King Sun, 13 Aug 2006 14:17:12 +0100 [ARM] 3752/1: fix versatile flash resource map Patch from Yoav Steinberg Flash resource mapping for versatile machine included one extra byte for the end address. This results in failure to map other resources on physical address directly after the NOR flash. Signed-off-by: Yoav Steinberg Signed-off-by: Russell King commit f54fa84dda211f68f65002efa44142207c886c79 tree 117113e866346afa5737a78ba3ba2085b059aab1 parent 2011e9249a252e0655807fbe6841f6cfe6b6c197 author Orjan Friberg Tue, 08 Aug 2006 23:31:40 -0700 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: usbtest.c: unsigned retval makes ctrl_out return 0 in case of error In my quest to try and figure out why test 14 (control write) doesn't work with my EZ-USB board, I noticed that sometimes testusb reported no error even though the kernel log complained "byte 0 is 0 not 2" etc. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2011e9249a252e0655807fbe6841f6cfe6b6c197 tree c9395f80099187cd9dc710874591e4e438558185 parent 922fdaa692e23bf57a10c16047d993c181991579 author Jonathan Davies Wed, 09 Aug 2006 10:48:03 +0100 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: ftdi_sio driver - new PIDs Signed-off-by: Jonathan Davies Signed-off-by: Greg Kroah-Hartman commit 922fdaa692e23bf57a10c16047d993c181991579 tree 6381403081e18fefa11a007b619caf245b5410e9 parent 7af569abc33ce09d3cb93e9b2160efff2531c59f author Norihiko Tomiyama Tue, 08 Aug 2006 14:31:25 +0900 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: Additional PID for SHARP W-ZERO3 I write a patch for ipaq.c. Would you like to add upstream tree ? This patch enables a support of "SHARP W-ZERO3(WS004SH)" and "SHARP W-ZERO3[es](WS007SH)". From: Norihiko Tomiyama Signed-off-by: Greg Kroah-Hartman commit 7af569abc33ce09d3cb93e9b2160efff2531c59f tree b8d4dd5cf7c9e01049f3cf3483f5b8c8b7c91bf0 parent 919aeadcfa8e72ec2d6bf7bd405a16c40b8d8ecf author Johannes Berg Wed, 19 Jul 2006 15:39:46 +0200 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: appletouch: fix atp_disconnect appletouch uses urb->transfer_dma after having freed the urb, this shows up only if the system is compiled with slab debugging. This patch fixes it by reordering the free calls. Signed-off-by: Johannes Berg Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit 919aeadcfa8e72ec2d6bf7bd405a16c40b8d8ecf tree 11552bd24b2a689cf02ce581024998fc4f44a8af parent b41ee5d62211825cbe5e583cafc2255c91385aee author Yoichi Yuasa Thu, 03 Aug 2006 09:54:24 +0900 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: removed a unbalanced #endif from ohci-au1xxx.c This patch has removed a unbalanced #endif from ohci-au1xxx.c . Please apply before 2.6.18 release. Error message was: In file included from drivers/usb/host/ohci-hcd.c:909: drivers/usb/host/ohci-au1xxx.c:113:2: #endif without #if Signed-off-by: Yoichi Yuasa Signed-off-by: Greg Kroah-Hartman commit b41ee5d62211825cbe5e583cafc2255c91385aee tree 7bd8ceb0069a844c0e84ab112b85785015ee9f12 parent f0c1dc07309f0fe3409b92eb170b648a487b1e81 author David Kuehling Mon, 07 Aug 2006 10:18:48 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 USB: unusual_devs entry for A-VOX WSX-300ER MP3 player This patch (as763) adds an unusual_devs entry for the A-VOX WSX-300ER MP3 player. From: David Kuehling Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f0c1dc07309f0fe3409b92eb170b648a487b1e81 tree bffa6977410d22edbc0dab8fe7be052865a1b9e4 parent e50d1088bf2e5a68068c5f602be1dcc3e52dc873 author Dave Jones Wed, 09 Aug 2006 15:25:09 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 PCI: remove dead HOTPLUG_PCI_SHPC_PHPRM_LEGACY option. Nothing in the tree references this config option. Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit e50d1088bf2e5a68068c5f602be1dcc3e52dc873 tree 72e502cb1f59081f07ea40344e23a46cb341d3b2 parent 1cc6daf2349ea07830906e05164256ab36d82697 author Kristen Carlson Accardi Tue, 08 Aug 2006 09:44:26 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 pciehp: make pciehp build for powerpc Make pciehp build on powerpc Signed-off-by: Kristen Carlson Accardi Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 1cc6daf2349ea07830906e05164256ab36d82697 tree 5385595a7b3cfdd92d70ed3bb3321ff6afdf072e parent e9539ee73a9b85bdc6eab9e15dd1ee639a815406 author Pavel Machek Tue, 08 Aug 2006 01:37:15 +0200 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 pr_debug() should not be used in drivers pr_debug() should not be used from drivers, add comment saying that. Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit e9539ee73a9b85bdc6eab9e15dd1ee639a815406 tree 3a3f2242c8e9d3f2f0b324dfe0fa324d3b1e9ee2 parent 4ca8a3c1b17cde8241eb9157484519427fa5bf91 author Brandon Philips Tue, 01 Aug 2006 14:04:17 -0500 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 genhd.c reference in Documentation/kobjects.txt block/genhd.c no longer in drivers/. Update Documentation/kobjects.txt Signed-off-by: Brandon Philips Signed-off-by: Greg Kroah-Hartman commit 4ca8a3c1b17cde8241eb9157484519427fa5bf91 tree e68a5b1148ae8a90751ff16bddac826b73a2e817 parent c4e321b85a89d7cd392d3105b2c033a6c58ed337 author Steven Rostedt Thu, 03 Aug 2006 12:28:11 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 Add stable branch to maintainers file While helping someone to submit a patch to the stable branch, I noticed that the stable branch is not listed in the MAINTAINERS file. This was after I went there to look for the email addresses for the stable branch list (stable@kernel.org). This patch adds the stable branch to the maintainers file so that people can find where to send patches when they have a fix for the stable team. Signed-off-by: Steven Rostedt Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 0ee6a17389ceef65f1a86c38872fa98f08489022 tree 38ccea4e0e55cffb16f9dc93b391a790a5048257 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Jean Delvare Fri, 11 Aug 2006 08:30:31 +0200 committer Len Brown Fri, 11 Aug 2006 15:06:17 -0400 ACPI: fix kfree in i2c_ec error path Signed-off-by: Jean Delvare Signed-off-by: Len Brown commit a19aa5c5fdda8b556ab238177ee27c5ef7873c94 tree 6c770c8fbbe3270bf1416c3edd8894d214e62657 parent e54b82d739d4a2ef992976c8c0692cdf89286420 author Roland Dreier Fri, 11 Aug 2006 08:56:57 -0700 committer Roland Dreier Fri, 11 Aug 2006 08:56:57 -0700 IB/mthca: Fix potential AB-BA deadlock with CQ locks When destroying a QP, mthca locks both the QP's send CQ and receive CQ. However, the following scenario is perfectly valid: QP_a: send_cq == CQ_x, recv_cq == CQ_y QP_b: send_cq == CQ_y, recv_cq == CQ_x The old mthca code simply locked send_cq and then recv_cq, which in this case could lead to an AB-BA deadlock if QP_a and QP_b were destroyed simultaneously. We can fix this by changing the locking code to lock the CQ with the lower CQ number first, which will create a consistent lock ordering. Also, the second CQ is locked with spin_lock_nested() to tell lockdep that we know what we're doing with the lock nesting. This bug was found by lockdep. Signed-off-by: Roland Dreier commit c4e321b85a89d7cd392d3105b2c033a6c58ed337 tree 9990b519bc24579e9497f1b15ca94f2fc9cd61d3 parent f8872f4cb4b58f06a27d0443668d12d49f3b5d31 parent dd2c609c59cd9daeb90d58f3d1bc3813e8987df1 author Greg Kroah-Hartman Thu, 10 Aug 2006 15:10:01 -0700 committer Greg Kroah-Hartman Thu, 10 Aug 2006 15:10:01 -0700 Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-mmc commit f8872f4cb4b58f06a27d0443668d12d49f3b5d31 tree cf6bd1786e902f99ab764f8d8482f557cd8cf531 parent 99baa75231e35aca41b9718adfb07f45ce40e84c parent 574dc0abab6650c5371df15ac708e48fa25bed89 author Greg Kroah-Hartman Thu, 10 Aug 2006 15:07:17 -0700 committer Greg Kroah-Hartman Thu, 10 Aug 2006 15:07:17 -0700 Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm commit e54b82d739d4a2ef992976c8c0692cdf89286420 tree c05b596945f17de89505f092ad870aef365b674f parent 9f737633e6ee54fc174282d49b2559bd2208391d author Michael S. Tsirkin Thu, 10 Aug 2006 10:46:56 -0700 committer Roland Dreier Thu, 10 Aug 2006 10:50:52 -0700 IB/mthca: Make fence flag work for send work requests The fence bit needs to be set in the doorbell too, not just the WQE. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit d0710c7c9eea2145a0614f39dbe9dc8cb4ae14da tree 6d89207033a0a4a9e0c02b507a7f4745d40d4a9d parent ebc4599990898ecaaace7ed40dfad6d8d9f2a24a author Horst Hummel Thu, 10 Aug 2006 15:45:16 +0200 committer Martin Schwidefsky Thu, 10 Aug 2006 15:45:16 +0200 [S390] dasd calls kzalloc while holding a spinlock. The dasd function dasd_set_uid calls kzalloc while holding the dasd_devmap_lock. Rearrange the code to do the memory allocation outside the lock. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 8d3d35b4e20dc2e678fc7cb51165905b5a32fb76 tree c2a70b74ddbcb74abad9cb5a410d916cfa4f2afb parent 013b68bf7cb4edfb8753aac9bde3cb60c84bc067 author Stephen Hemminger Wed, 09 Aug 2006 14:14:50 -0700 committer Jeff Garzik Thu, 10 Aug 2006 08:30:48 -0400 [PATCH] sky2: phy power problems on 88e805X chips On the 88E805X chipsets (used in laptops), the PHY was not getting powered out of shutdown properly. The variable reg1 was getting reused incorrectly. This is probably the cause of the bug. http://bugzilla.kernel.org/show_bug.cgi?id=6471 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf tree 7cfcc47161c3231a204e40f1421807f579a57938 parent 51704c609fcf256dacfcfae3622eb6ef53ac5b48 author Martin Hicks Wed, 05 Jul 2006 15:06:13 -0400 committer Jeff Garzik Thu, 10 Aug 2006 08:29:12 -0400 [PATCH] libata: PHY reset requires writing 0x4 to SControl Hi, Reading the Intel VSC and AHCI it seems like writing 0x302 is incorrect. The only valid values are 4, 1 and 0. Writing 4 disables the PHY. Signed-off-by: Martin Hicks Signed-off-by: Jeff Garzik commit 51704c609fcf256dacfcfae3622eb6ef53ac5b48 tree 628a84bb0a986238c6004578e3cede5f0740154f parent 22aac0896b1b0b8cabaf00714c55dd12f25d5738 author Albert Lee Wed, 09 Aug 2006 18:36:22 +0800 committer Jeff Garzik Thu, 10 Aug 2006 06:55:18 -0400 [PATCH] libata: Use ATA_FLAG_PIO_POLLING for pdc_adma pdc_adma was overlooked and broken by the irq-pio patch: Only HSM_ST_LAST interrupts should be delivered to this LLDD. Adding ATA_FLAG_PIO_POLLING to pdc_adma fixes the problem (temporarily), before we convert the irq handler of pdc_adma to handle all interrupts. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 99baa75231e35aca41b9718adfb07f45ce40e84c tree 43af56a0ebfab13169eff61ffa3bfb13c5fb1bd0 parent fff642570dc47ab76491fe81ee6599269c4eb13e parent 0e1edbd99994270023cea5afe593f972eb09a778 author Greg Kroah-Hartman Wed, 09 Aug 2006 23:57:52 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 23:57:52 -0700 Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6 commit 0e1edbd99994270023cea5afe593f972eb09a778 tree e4b2618172c17426d200ec435c24daaf606e2437 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Nathan Scott Thu, 10 Aug 2006 14:40:41 +1000 committer Nathan Scott Thu, 10 Aug 2006 14:40:41 +1000 [XFS] Fix xfs_free_extent related NULL pointer dereference. We recently fixed an out-of-space deadlock in XFS, and part of that fix involved the addition of the XFS_ALLOC_FLAG_FREEING flag to some of the space allocator calls to indicate they're freeing space, not allocating it. There was a missed xfs_alloc_fix_freelist condition test that did not correctly test "flags". The same test would also test an uninitialised structure field (args->userdata) and depending on its value either would or would not return early with a critical buffer pointer set to NULL. This fixes that up, adds asserts to several places to catch future botches of this nature, and skips sections of xfs_alloc_fix_freelist that are irrelevent for the space-freeing case. SGI-PV: 955303 SGI-Modid: xfs-linux-melb:xfs-kern:26743a Signed-off-by: Nathan Scott commit fff642570dc47ab76491fe81ee6599269c4eb13e tree f5620d5af28bcd5614386a43febc5751423abf05 parent 06aebfb7faa13258af5230ff3d1587ece6c0250e author David S. Miller Wed, 09 Aug 2006 17:36:15 -0700 committer David S. Miller Wed, 09 Aug 2006 17:36:15 -0700 [IPX]: Fix typo, ipxhdr() --> ipx_hdr() Noticed by Dave Jones. Signed-off-by: David S. Miller commit 06aebfb7faa13258af5230ff3d1587ece6c0250e tree 8d2703662be840f8e64084d42706b1e4e5a354c9 parent 79860a9a79a17f1bed0713680a3995467405ba49 author Herbert Xu Wed, 09 Aug 2006 16:52:04 -0700 committer David S. Miller Wed, 09 Aug 2006 16:52:04 -0700 [IPV6]: The ifa lock is a BH lock The ifa lock is expected to be taken in BH context (by addrconf timers) so we must disable BH when accessing it from user context. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 79860a9a79a17f1bed0713680a3995467405ba49 tree bf127cfc807aef0ef4f5bdc53b43a6f1f32d3fd1 parent a4657141091c2f975fa35ac1ad28fffdd756091e author Alan Cox Wed, 09 Aug 2006 15:04:58 +0100 committer Greg Kroah-Hartman Wed, 09 Aug 2006 15:43:27 -0700 [PATCH] PATCH: 2.6.18 oops on boot fix for IDE When the IDE fix for Jmicron went in one piece went walking somewhere (send log shows my end somehow). Without this sometimes you get an oops on boot. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit a4657141091c2f975fa35ac1ad28fffdd756091e tree d284f416d2ffb21d5cb3a74843a9ab976ec32193 parent 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e parent 7c91767a6b701543c93ebcd611dab61deff3dad1 author Greg Kroah-Hartman Wed, 09 Aug 2006 11:49:13 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 11:49:13 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e tree 5d6bab099bb8376528847ec37f162d218c7940b9 parent 897e11a40baf24224bd0edc948f908ed07c5675d parent 013b68bf7cb4edfb8753aac9bde3cb60c84bc067 author Greg Kroah-Hartman Wed, 09 Aug 2006 11:46:30 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 11:46:30 -0700 Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 897e11a40baf24224bd0edc948f908ed07c5675d tree a256194bc50f9f0eeef68d7cba746ae4d35629b4 parent ad552692a4489917fa4b71f9c6a91baae4aee799 parent 22aac0896b1b0b8cabaf00714c55dd12f25d5738 author Greg Kroah-Hartman Wed, 09 Aug 2006 11:45:59 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 11:45:59 -0700 Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 7c91767a6b701543c93ebcd611dab61deff3dad1 tree 5ccc47d32641d1dacff118bb6b4f7256acb8e2dc parent 7b1ba8de569460894efa892457af7a37c0d574f9 author Dmitry Mishin Wed, 09 Aug 2006 02:25:54 -0700 committer David S. Miller Wed, 09 Aug 2006 02:25:54 -0700 [NET]: add_timer -> mod_timer() in dst_run_gc() Patch from Dmitry Mishin : Replace add_timer() by mod_timer() in dst_run_gc in order to avoid BUG message. CPU1 CPU2 dst_run_gc() entered dst_run_gc() entered spin_lock(&dst_lock) ..... del_timer(&dst_gc_timer) fail to get lock .... mod_timer() <--- puts timer back to the list add_timer(&dst_gc_timer) <--- BUG because timer is in list already. Found during OpenVZ internal testing. At first we thought that it is OpenVZ specific as we added dst_run_gc(0) call in dst_dev_event(), but as Alexey pointed to me it is possible to trigger this condition in mainstream kernel. F.e. timer has fired on CPU2, but the handler was preeempted by an irq before dst_lock is tried. Meanwhile, someone on CPU1 adds an entry to gc list and starts the timer. If CPU2 was preempted long enough, this timer can expire simultaneously with resuming timer handler on CPU1, arriving exactly to the situation described. Signed-off-by: Dmitry Mishin Signed-off-by: Kirill Korotaev Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit ebc4599990898ecaaace7ed40dfad6d8d9f2a24a tree d372ff43bf40c11576671a7a35185b034d3a5a4d parent 5cb900a34f640771a4ab6a178659c75022f2971a author Horst Hummel Wed, 09 Aug 2006 10:30:22 +0200 committer Martin Schwidefsky Wed, 09 Aug 2006 10:30:22 +0200 [S390] dasd set offline kernel bug. The request queue flush function of the dasd driver has to dequeue the requests first and then call the end request function. Otherwise a kernel bug in ll_rw_block.c might get triggered. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 22aac0896b1b0b8cabaf00714c55dd12f25d5738 tree fbae079c8ca9b22103a1e11439ae8b738d756c72 parent 85455dd34219376dcc7dce94bea67058f0b7d731 author Tejun Heo Tue, 08 Aug 2006 14:08:59 +0900 committer Jeff Garzik Wed, 09 Aug 2006 01:16:27 -0400 [PATCH] libata: clear sdev->locked on door lock failure SCSI EH locks door if sdev->locked is set. Sometimes door lock command fails continuously (e.g. when medium is not present) and as libata uses EH to acquire sense data, this easily creates a loop where a failed lock door invokes EH and EH issues lock door on completion. This patch clears sdev->locked on door lock failure to break this loop. This problem has been spotted and diagnosed by Unicorn Chang . Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 85455dd34219376dcc7dce94bea67058f0b7d731 tree dc81f6f2fa31fef75fec99096c52c6213302ade2 parent c71d6be54e92c4b2d31faf51850354aff22b82b0 author Keith Owens Tue, 08 Aug 2006 13:51:02 +1000 committer Jeff Garzik Wed, 09 Aug 2006 01:16:27 -0400 [PATCH] Fix compile problem when sata debugging is on Fix a sata debug print statement that still uses an old variable name. Signed-off-by: Keith Owens Signed-off-by: Jeff Garzik commit 013b68bf7cb4edfb8753aac9bde3cb60c84bc067 tree 7ce7d4a4c5e519b4a8f60ec6eff0d673bfa74fb9 parent 2f96740c26f1dcff9111dca3e01379ab12aafde5 author Brice Goglin Wed, 09 Aug 2006 00:07:53 -0400 committer Jeff Garzik Wed, 09 Aug 2006 00:12:47 -0400 [PATCH] myri10ge: always re-enable dummy rdmas in myri10ge_resume Dummy RDMA are always enabled on device startup since commit 9a71db721a2cbb9921b929b2699ab181f5a3c6c0 (to work around buggy PCIe chipsets which do not implement resending properly). But, we also need to always re-enable them when resuming the device. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit c71d6be54e92c4b2d31faf51850354aff22b82b0 tree ab0f157c958658aa57e17fffce5d67f6e80c3b1b parent 9f737633e6ee54fc174282d49b2559bd2208391d parent 77f3f879387cc5fce6c7a4ca7777c586fe6291cd author Jeff Garzik Tue, 08 Aug 2006 23:59:39 -0400 committer Jeff Garzik Tue, 08 Aug 2006 23:59:39 -0400 Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into upstream-fixes commit 2f96740c26f1dcff9111dca3e01379ab12aafde5 tree fd40f2f794431089c18659ecfaa054cad5dca22e parent 9f737633e6ee54fc174282d49b2559bd2208391d parent 782a6675119c76c071e74e2ddd98268f47770cba author Jeff Garzik Tue, 08 Aug 2006 23:48:48 -0400 committer Jeff Garzik Tue, 08 Aug 2006 23:48:48 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 7b1ba8de569460894efa892457af7a37c0d574f9 tree 8739f17110b12aedf5f3067c3dba1f3350727f7a parent 70f8e78e150425b01c1099087ad3decacf7e4ccf author Stephen Hemminger Tue, 08 Aug 2006 16:48:51 -0700 committer David S. Miller Tue, 08 Aug 2006 16:48:51 -0700 [IPX]: Another nonlinear receive fix Need to check some more cases in IPX receive. If the skb is purely fragments, the IPX header needs to be extracted. The function pskb_may_pull() may in theory invalidate all the pointers in the skb, so references to ipx header must be refreshed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 70f8e78e150425b01c1099087ad3decacf7e4ccf tree a8b670e567d0936b830d2212101e5593b4f1c57c parent 1b2a720506ccf7c30baaeda5d990c29b31e21726 author David S. Miller Tue, 08 Aug 2006 16:47:37 -0700 committer David S. Miller Tue, 08 Aug 2006 16:47:37 -0700 [RTNETLINK]: Fix IFLA_ADDRESS handling. The ->set_mac_address handlers expect a pointer to a sockaddr which contains the MAC address, whereas IFLA_ADDRESS provides just the MAC address itself. So whip up a sockaddr to wrap around the netlink attribute for the ->set_mac_address call. Signed-off-by: David S. Miller commit ad552692a4489917fa4b71f9c6a91baae4aee799 tree 26cd1c8a92f9c8f9a219961fe054adbf877e85f4 parent 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 parent 0851fb48486c044476b019029245cb9b348fca33 author Greg Kroah-Hartman Tue, 08 Aug 2006 14:19:23 -0700 committer Greg Kroah-Hartman Tue, 08 Aug 2006 14:19:23 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb commit 0851fb48486c044476b019029245cb9b348fca33 tree 4a664e168f9d809963a52f507e0b5c4f6803e881 parent eafa98177a388700d613c187c7716e11869b7171 author Yeasah Pell Tue, 08 Aug 2006 09:10:18 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4431): Add several error checks to dst Signed-off-by: Yeasah Pell Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit eafa98177a388700d613c187c7716e11869b7171 tree b8f8fc1903e72a3695b5435b74c5cb24dfaf9ac0 parent 8a016dcc8383bedc731bca9fdedae77ff52a6ad7 author Diego Calleja Tue, 08 Aug 2006 09:10:17 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4430): Quickcam_messenger compilation fix In bugzilla #6943, Maxim Britov reported: "I can enable Logitech quickcam support in .config, but it want be compile. I have to add into drivers/media/video/Makefile: obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/" He's right, just enable that driver as module while disabling every other driver that gets into that directory, nothing will get compiled. This patch fixes the Makefile. Signed-off-by: Diego Calleja Acked-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8a016dcc8383bedc731bca9fdedae77ff52a6ad7 tree 0accaa04a9d8976f95ca46929ca65f446cc08c53 parent 43c560fa59ef2688d891f6431e972b7763b73a00 author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:16 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4427): Fix V4L1 Compat for VIDIOCGPICT ioctl Signed-off-by: Mauro Carvalho Chehab commit 43c560fa59ef2688d891f6431e972b7763b73a00 tree 6b58b6764d2f9cac26ba3e646fc8c867bbe1e262 parent e335fada5afef0658038b6bec432d37f332da9fc author Hans Verkuil Tue, 08 Aug 2006 09:10:15 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4419): Turn on the Low Noise Amplifier of the Samsung tuners. Without the LNA these tuners perform very poorly (read 'unwatchable') when the signal is weak. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e335fada5afef0658038b6bec432d37f332da9fc tree 93aaf4228723915db153bbf9eaaa7d0c57e2db90 parent 17531c168c7b8138b5379a85de788798fc6696e1 author Hans Verkuil Tue, 08 Aug 2006 09:10:15 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:03 -0300 V4L/DVB (4418): Fix broken msp3400 module option 'standard' Due to a wrong statement order the 'standard' module option didn't work for 'G' model chips. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 17531c168c7b8138b5379a85de788798fc6696e1 tree f0ca8541a78786c01c90fefe58a11c9dc8ca5504 parent b02dc515914bc37f5e406cc6f622fc06991eb779 author Hans Verkuil Tue, 08 Aug 2006 09:10:12 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:03 -0300 V4L/DVB (4416): Cx25840_read4 has wrong endianness. cx25840_read4 assembled the bytes in the wrong order. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b02dc515914bc37f5e406cc6f622fc06991eb779 tree 29eaa79b76db0d98de2d057aba43ff14200ccb59 parent 7fb6529762f8185f792ad74adcf211713f973c80 author Trent Piepho Tue, 08 Aug 2006 09:10:12 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:03 -0300 V4L/DVB (4411): Fix minor errors in build files In pwc Kconfig, change 'depends' to 'depends on' In dvb-core Makefile, change '=' to ':=' Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 7fb6529762f8185f792ad74adcf211713f973c80 tree c6dd9bb2f151561e795977366669df55faf8eafb parent 0dfa9abd6bd153364da8cb131db0d0404ab15ad1 author Mauro Carvalho Chehab Tue, 08 Aug 2006 15:47:31 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:52:52 -0300 V4L/DVB (4407): Driver dsbr100 is a radio device, not a video one! Signed-off-by: Mauro Carvalho Chehab commit 0dfa9abd6bd153364da8cb131db0d0404ab15ad1 tree 5c46dc1a46e43eb08fe0ba7900a88fdd35577e7e parent 3cdc0f263b9fe99f7dfcef49df7a148b458e9d11 author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:10 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:07 -0300 V4L/DVB (4399): Fix a typo that caused some compat stuff to not work Config option typo: -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT Signed-off-by: Mauro Carvalho Chehab commit 3cdc0f263b9fe99f7dfcef49df7a148b458e9d11 tree a859c93a8dd066db9548c0cc9e4d02f7853f37cd parent 6054b68e84478e66e626bde33f93b5f0bf48c180 author Luc Van Oostenryck Tue, 08 Aug 2006 09:10:10 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:05 -0300 V4L/DVB (4395): Restore compat_ioctl in pwc driver The compat_ioctl support of the pwc driver was dropped during the last update of the driver. I suppose it was by mistake. If yes here is the patch to restore the support. Signed-off-by: Luc Van Oostenryck Signed-off-by: Mauro Carvalho Chehab commit 6054b68e84478e66e626bde33f93b5f0bf48c180 tree f483ed2777058c7c5ae6cc447bdd19d5309b4ca0 parent 5bdd6cc3300be534f2a2cf826e3fb926b5695698 author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:06 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:03 -0300 V4L/DVB (4371b): Fix V4L1 dependencies at drivers under sound/oss and sound/pci TVMixer and FM801 Tea5757 are still using V4L1 API. Signed-off-by: Mauro Carvalho Chehab commit 5bdd6cc3300be534f2a2cf826e3fb926b5695698 tree 401b0f19ff7930666d0afb3c0701c769b0d498a0 parent 487206f26364a878f5f8cec9f92796d403f1d7c9 author Mauro Carvalho Chehab Tue, 25 Jul 2006 16:17:54 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:01 -0300 V4L/DVB (4371a): Fix V4L1 dependencies on compat_ioctl32 Compat32 should be able to handle V4L1 ioctls if the old API support were selected. Signed-off-by: Mauro Carvalho Chehab commit 487206f26364a878f5f8cec9f92796d403f1d7c9 tree 7f5a8271373daf6e0763aa27a9e1f561c281fc99 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:01 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:54:12 -0300 V4L/DVB (4340): Videodev.h should be included also when V4L1_COMPAT is selected. Signed-off-by: Mauro Carvalho Chehab commit 81b73dd92b97423b8f5324a59044da478c04f4c4 tree 032f8415eb980d7f231e8e2490fba3c5356aadf9 parent dcc42f483d6808ba4d04af9da35e7e47b711f6c2 author Haren Myneni Thu, 27 Jul 2006 14:29:00 -0700 committer Paul Mackerras Tue, 08 Aug 2006 16:00:11 +1000 [POWERPC] Fix might-sleep warning on removing cpus Noticing the following might_sleep warning (dump_stack()) during kdump testing when CONFIG_DEBUG_SPINLOCK_SLEEP is enabled. All secondary CPUs will be calling rtas_set_indicator with interrupts disabled to remove them from global interrupt queue. BUG: sleeping function called from invalid context at arch/powerpc/kernel/rtas.c:463 in_atomic():1, irqs_disabled():1 Call Trace: [C00000000FFFB970] [C000000000010234] .show_stack+0x68/0x1b0 (unreliable) [C00000000FFFBA10] [C000000000059354] .__might_sleep+0xd8/0xf4 [C00000000FFFBA90] [C00000000001D1BC] .rtas_busy_delay+0x20/0x5c [C00000000FFFBB20] [C00000000001D8A8] .rtas_set_indicator+0x6c/0xcc [C00000000FFFBBC0] [C000000000048BF4] .xics_teardown_cpu+0x118/0x134 [C00000000FFFBC40] [C00000000004539C] .pseries_kexec_cpu_down_xics+0x74/0x8c [C00000000FFFBCC0] [C00000000002DF08] .crash_ipi_callback+0x15c/0x188 [C00000000FFFBD50] [C0000000000296EC] .smp_message_recv+0x84/0xdc [C00000000FFFBDC0] [C000000000048E08] .xics_ipi_dispatch+0xf0/0x130 [C00000000FFFBE50] [C00000000009EF10] .handle_IRQ_event+0x7c/0xf8 [C00000000FFFBF00] [C0000000000A0A14] .handle_percpu_irq+0x90/0x10c [C00000000FFFBF90] [C00000000002659C] .call_handle_irq+0x1c/0x2c [C00000000058B9C0] [C00000000000CA10] .do_IRQ+0xf4/0x1a4 [C00000000058BA50] [C0000000000044EC] hardware_interrupt_entry+0xc/0x10 --- Exception: 501 at .plpar_hcall_norets+0x14/0x1c LR = .pseries_dedicated_idle_sleep+0x190/0x1d4 [C00000000058BD40] [C00000000058BDE0] 0xc00000000058bde0 (unreliable) [C00000000058BDF0] [C00000000001270C] .cpu_idle+0x10c/0x1e0 [C00000000058BE70] [C000000000009274] .rest_init+0x44/0x5c To fix this issue, rtas_set_indicator_fast() is added so that will not wait for RTAS 'busy' delay and this new function is used for kdump (in xics_teardown_cpu()) and for CPU hotplug ( xics_migrate_irqs_away() and xics_setup_cpu()). Note that the platform architecture spec says that set-indicator on the indicator we're using here is not permitted to return the busy or extended busy status codes. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit dcc42f483d6808ba4d04af9da35e7e47b711f6c2 tree 22db9fe48c6d35bb46cec23225eacc6bbf9aa4ac parent 9f737633e6ee54fc174282d49b2559bd2208391d author Sonny Rao Wed, 02 Aug 2006 00:20:09 -0400 committer Paul Mackerras Tue, 08 Aug 2006 15:55:12 +1000 [POWERPC] fix PMU initialization on pseries lpar We should not be calling power4_enable_pmcs() in pseries_lpar_enable_pmcs(); just doing the hypercall is sufficient. Prior to 2.6.15 we did not call power4_enable_pmcs() for an lpar. power4_enable_pmcs() tries to read the hid0 register which is no longer legal for an lpar in newer Power processors. Signed-off-by: Paul Mackerras commit 1b2a720506ccf7c30baaeda5d990c29b31e21726 tree 5990f56e364077c83563566ed64beae95b855a9f parent bd37a088596ccdb2b2dd3299e25e333bca7a9a34 author Michael Chan Mon, 07 Aug 2006 21:46:02 -0700 committer David S. Miller Mon, 07 Aug 2006 21:46:02 -0700 [TG3]: Fix tx race condition Fix a subtle race condition between tg3_start_xmit() and tg3_tx() discovered by Herbert Xu : CPU0 CPU1 tg3_start_xmit() if (tx_ring_full) { tx_lock tg3_tx() if (!netif_queue_stopped) netif_stop_queue() if (!tx_ring_full) update_tx_ring netif_wake_queue() tx_unlock } Even though tx_ring is updated before the if statement in tg3_tx() in program order, it can be re-ordered by the CPU as shown above. This scenario can cause the tx queue to be stopped forever if tg3_tx() has just freed up the entire tx_ring. The possibility of this happening should be very rare though. The following changes are made: 1. Add memory barrier to fix the above race condition. 2. Eliminate the private tx_lock altogether and rely solely on netif_tx_lock. This eliminates one spinlock in tg3_start_xmit() when the ring is full. 3. Because of 2, use netif_tx_lock in tg3_tx() before calling netif_wake_queue(). 4. Change TX_BUFFS_AVAIL to an inline function with a memory barrier. Herbert and David suggested using the memory barrier instead of volatile. 5. Check for the full wake queue condition before getting netif_tx_lock in tg3_tx(). This reduces the number of unnecessary spinlocks when the tx ring is full in a steady-state condition. 6. Update version to 3.65. Signed-off-by: Michael Chan Acked-by: Herbert Xu Signed-off-by: David S. Miller commit bd37a088596ccdb2b2dd3299e25e333bca7a9a34 tree 733ea30682425011df988e9b49f350ea4af3233e parent 69d8c28c9578ce78b3dc1b9be36926d962282898 author Wei Yongjun Mon, 07 Aug 2006 21:04:15 -0700 committer David S. Miller Mon, 07 Aug 2006 21:04:15 -0700 [TCP]: SNMPv2 tcpOutSegs counter error Do not count retransmitted segments. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 69d8c28c9578ce78b3dc1b9be36926d962282898 tree 99de9e5074b93c3aee6577fb817ebdfdcbf678b8 parent aaf580601ff244df82324fff380ed6740f27ef03 author David S. Miller Mon, 07 Aug 2006 20:52:10 -0700 committer David S. Miller Mon, 07 Aug 2006 20:52:10 -0700 [PKTGEN]: Make sure skb->{nh,h} are initialized in fill_packet_ipv6() too. Mirror the bug fix from fill_packet_ipv4() Signed-off-by: David S. Miller commit aaf580601ff244df82324fff380ed6740f27ef03 tree be59a493781fddb2f0201de3d5e335524bbd1959 parent 8d1502de27c46b365b5c86e17d173083d3d6c9ac author Chen-Li Tien Mon, 07 Aug 2006 20:49:07 -0700 committer David S. Miller Mon, 07 Aug 2006 20:49:07 -0700 [PKTGEN]: Fix oops when used with balance-tlb bonding Signed-off-by: Chen-Li Tien Signed-off-by: David S. Miller commit 8d1502de27c46b365b5c86e17d173083d3d6c9ac tree e2fa9cebe61e08aaf65d0457c48347cc67716609 parent 8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b author Kirill Korotaev Mon, 07 Aug 2006 20:44:22 -0700 committer David S. Miller Mon, 07 Aug 2006 20:44:22 -0700 [IPV4]: Limit rt cache size properly. From: Kirill Korotaev During OpenVZ stress testing we found that UDP traffic with random src can generate too much excessive rt hash growing leading finally to OOM and kernel panics. It was found that for 4GB i686 system (having 1048576 total pages and 225280 normal zone pages) kernel allocates the following route hash: syslog: IP route cache hash table entries: 262144 (order: 8, 1048576 bytes) => ip_rt_max_size = 4194304 entries, i.e. max rt size is 4194304 * 256b = 1Gb of RAM > normal_zone Attached the patch which removes HASH_HIGHMEM flag from alloc_large_system_hash() call. Signed-off-by: David S. Miller commit 8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b tree 35b76d98988aabfc78a57342291b4be63bb04f99 parent d14cc9a342a8004b0ecfe66f1f12120962b61d8c author Stephen Hemminger Mon, 07 Aug 2006 20:09:20 -0700 committer David S. Miller Mon, 07 Aug 2006 20:09:20 -0700 [IPX]: Header length validation needed This patch will linearize and check there is enough data. It handles the pprop case as well as avoiding a whole audit of the routing code. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d14cc9a342a8004b0ecfe66f1f12120962b61d8c tree 2789722fbdd2118b51f09d47373b83103320417e parent 7b2e497a06c0e93719fda88820e057b635e8fae2 author Christoph Hellwig Mon, 07 Aug 2006 16:11:48 -0700 committer David S. Miller Mon, 07 Aug 2006 16:11:48 -0700 [TG3]: skb->dev assignment is done by netdev_alloc_skb All caller of netdev_alloc_skb need to assign skb->dev shortly afterwards. Move it into common code. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 7b2e497a06c0e93719fda88820e057b635e8fae2 tree 5ca55484d813656f56cf7fc86cafd041327c7dae parent 766ea8cce007e699679109df4fa469b870ba4860 author Christoph Hellwig Mon, 07 Aug 2006 16:09:04 -0700 committer David S. Miller Mon, 07 Aug 2006 16:09:04 -0700 [NET]: Assign skb->dev in netdev_alloc_skb Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 766ea8cce007e699679109df4fa469b870ba4860 tree 07b343a0be217f1cc2b1b06c65dc371ac45fadae parent 9f737633e6ee54fc174282d49b2559bd2208391d author Christoph Hellwig Mon, 07 Aug 2006 15:49:53 -0700 committer David S. Miller Mon, 07 Aug 2006 15:49:53 -0700 [NET]: Fix alloc_skb comment typo Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 tree 2700dbf73a0faef3a8678499c502c1bbaad18a07 parent 8b384b81e27222a307576630c89ea26e17b7be6a parent 9ee4e3365dd0dab4c1e02fe44dc08a223b826c72 author Greg Kroah-Hartman Mon, 07 Aug 2006 13:39:55 -0700 committer Greg Kroah-Hartman Mon, 07 Aug 2006 13:39:55 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 commit 9ee4e3365dd0dab4c1e02fe44dc08a223b826c72 tree f133dfb7e53d0d3ea6f7734c4087dc02f737c5a3 parent 58a2f7d85aaf4c41157f15c43a913b5c3c6b3adb author Sam Ravnborg Mon, 07 Aug 2006 21:01:36 +0200 committer Sam Ravnborg Mon, 07 Aug 2006 21:01:36 +0200 kbuild: external modules shall not check config consistency external modules needs include/linux/autoconf.h and include/config/auto.conf but skip the integrity test of these. Even with a newer Kconfig file we shall just proceed since external modules simply uses the kernel source and shall not attempt to modify it. Error out if a config fiel is missing since they are mandatory. Signed-off-by: Sam Ravnborg commit 58a2f7d85aaf4c41157f15c43a913b5c3c6b3adb tree 1e7b373066c747e25086e8ce3a8789e02538dea2 parent 8ccf28324c14096bef005c90a2bf5e03ffa07cc6 author Sam Ravnborg Mon, 07 Aug 2006 20:58:28 +0200 committer Sam Ravnborg Mon, 07 Aug 2006 20:58:28 +0200 kbuild: do not try to build content of initramfs When a file supplied via CONFIG_INITRAMFS pointed to a file for which kbuild had a rule to compile it (foo.c => foo.o) then kbuild would compile the file before adding the file to the initramfs. Teach make that files included in initramfs shall not be updated by adding an 'empty command'. (See "Using Empty Commands" in info make). Signed-off-by: Sam Ravnborg commit 883d4cae4a2b01a05193cf2665c77b7489a8b6a0 tree 1d4f06fa7bdadf025159ff5408f14080552a0cb0 parent 7bf72edee614e10b8d470c40a326f47bfdd69992 author Mark Fasheh Mon, 05 Jun 2006 16:41:00 -0400 committer Mark Fasheh Mon, 07 Aug 2006 11:07:01 -0700 ocfs2: allocation hints Record the most recently used allocation group on the allocation context, so that subsequent allocations can attempt to optimize for contiguousness. Local alloc especially should benefit from this as the current chain search tends to let it spew across the disk. Signed-off-by: Mark Fasheh commit 7bf72edee614e10b8d470c40a326f47bfdd69992 tree 8309812d2e256da821d2774a5a719663038093fa parent 101ebf256de54e78e6d3277adacf656e125a2c5a author Mark Fasheh Wed, 03 May 2006 17:46:50 -0700 committer Mark Fasheh Mon, 07 Aug 2006 11:04:38 -0700 ocfs2: better group descriptor consistency checks Try to catch corrupted group descriptors with some stronger checks placed in a couple of strategic locations. Detect a failed resizefs and refuse to allocate past what bitmap i_clusters allows. Signed-off-by: Mark Fasheh commit 101ebf256de54e78e6d3277adacf656e125a2c5a tree 73f19064663888bb5379c746459090a3807a2a47 parent 9acd72f4240429dfd762c9a2c7eb5c18b5d32529 author Mark Fasheh Tue, 02 May 2006 17:54:45 -0700 committer Mark Fasheh Mon, 07 Aug 2006 11:04:07 -0700 ocfs2: limit cluster bitmap information saved at mount We were storing cluster count on the ocfs2_super structure, but never actually using it so remove that. Also, we don't want to populate the uptodate cache with the unlocked block read - it is technically safe as is, but we should change it for correctness. Signed-off-by: Mark Fasheh commit 9acd72f4240429dfd762c9a2c7eb5c18b5d32529 tree 01d0a01072ef642861c1534aad30f72c837a8e74 parent 34e3d180370c44ad3ecd3a1f9099e150d3bb103f author Adrian Bunk Sat, 15 Jul 2006 02:36:01 +0200 committer Mark Fasheh Mon, 07 Aug 2006 10:55:50 -0700 [PATCH] fs/ocfs2/dlm/dlmmaster.c: unexport dlm_migrate_lockres This patch removes the unused EXPORT_SYMBOL_GPL(dlm_migrate_lockres). Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 34e3d180370c44ad3ecd3a1f9099e150d3bb103f tree f0e942f11654d3923ddf2c854be5e94572eb52e9 parent a23eac99d4392b8b779305498d7614e41a0e16e9 author Kurt Hackel Sat, 15 Jul 2006 10:22:39 -0700 committer Mark Fasheh Mon, 07 Aug 2006 10:55:22 -0700 ocfs2: fix check for locally granted state during dlmunlock() If a process requests a lock cancel but the lock has been remotely granted already then there is no need to send the cancel message. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit a23eac99d4392b8b779305498d7614e41a0e16e9 tree 29541e6786334eb1556918ff9b24affeb5dbd3e5 parent 4b1af774451bbc8440719e3fe441934a337c3b63 author Kurt Hackel Sun, 18 Jun 2006 21:28:01 -0700 committer Mark Fasheh Mon, 07 Aug 2006 10:54:59 -0700 ocfs2: do not modify lksb->status in the unlock ast This can race with other ast notification, which can cause bad status values to propagate into the unlock ast. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 4b1af774451bbc8440719e3fe441934a337c3b63 tree 98a3e0570887625bab6ccc439d13a2b40a45038b parent 9f737633e6ee54fc174282d49b2559bd2208391d author Kurt Hackel Mon, 26 Jun 2006 15:17:47 -0700 committer Mark Fasheh Mon, 07 Aug 2006 10:54:10 -0700 ocfs2: Fix lvb corruption Properly ignore LVB flags during a PR downconvert. This avoids an illegal lvb update. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 8b384b81e27222a307576630c89ea26e17b7be6a tree 4a601caf262651bc90449ac51999bcaf07cce4b3 parent dbd43d08642c037beb937c2670976c076120507b parent 65200c291c4ce397835d8232eaa0878b765a9bce author Greg Kroah-Hartman Mon, 07 Aug 2006 10:26:49 -0700 committer Greg Kroah-Hartman Mon, 07 Aug 2006 10:26:49 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 commit 5cb900a34f640771a4ab6a178659c75022f2971a tree 111b0b084a7c4011e4e901542c3dc77b6db38a8b parent 37ab46a3f4983c32d5b5ab6a0366ec482e38ba47 author Gerald Schaefer Mon, 07 Aug 2006 18:13:09 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 18:13:09 +0200 [S390] add __cpuinit to appldata_cpu_notify Use __cpuinit for CPU hotplug notifier function. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 37ab46a3f4983c32d5b5ab6a0366ec482e38ba47 tree 99b89f690e9aafc75ad9a563214338483d496c27 parent 65200c291c4ce397835d8232eaa0878b765a9bce author Martin Schwidefsky Mon, 07 Aug 2006 18:13:06 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 18:13:06 +0200 [S390] xpram system device class. Remove system device class for xpram. It creates the directory hierarchy under /sys/devices/system/xpram/xpram0. The xpram0 directory is empty and it is always created while xpram1 and following devices are always missing, independent if the devices exist or not. Since the xpram devices are listed in /proc/partitions and /sys/block/ as slram the system device class for xpram is meaningless. Signed-off-by: Martin Schwidefsky commit 65200c291c4ce397835d8232eaa0878b765a9bce tree 32b6282ae63318d92c630f41a3ca6fd04e4bbbbf parent 4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f author Peter Oberparleiter Mon, 07 Aug 2006 17:00:33 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 17:00:33 +0200 [S390] lost interrupt after chpid vary off/on cycle. I/O on a CCW device may stall if a channel path to that device is logicaly varied off/on. A user I/O interrupt can get misinterpreted as interrupt for an internal path verification operation due to a missing check and is therefore never reported to the device driver. Correct check for pending interruptions before starting path verification. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f tree 6f504c1716d8710025e5a58153b90cd4f2d893f2 parent 25a2001a285e187d99ea347693bedd73b3e0722a author Cornelia Huck Mon, 07 Aug 2006 17:00:30 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 17:00:30 +0200 [S390] retry after deferred condition code. Do a retry of read device characteristics / read configuration data when a deferred condition code 1 is encountered in ccw_device_wake_up(). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 25a2001a285e187d99ea347693bedd73b3e0722a tree beb8855dc37c0593ebc6fe325e208b4696741101 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Heiko Carstens Mon, 07 Aug 2006 17:00:28 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 17:00:28 +0200 [S390] tape class return value handling. Without this patch register_tape_dev() will always fail, but might return a value that is not an error number. This will lead to accesses to already freed memory areas... Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit dd2c609c59cd9daeb90d58f3d1bc3813e8987df1 tree 2a37fb9ad8dae6fb051374824d601498ce5a4006 parent 916f3ac680fcc4c142e9acd46161f55533b11760 author Pierre Ossman Mon, 07 Aug 2006 01:40:04 +0200 committer Russell King Mon, 07 Aug 2006 14:47:54 +0100 [MMC] Another stray 'io' reference Another misuse of the global 'io' variable instead of the local 'base'. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit dbd43d08642c037beb937c2670976c076120507b tree 4d44a4b54a731eb290e040345c38ed9e1e7ecc6a parent c34c07d6946ec8969fa71ba03dbb95091f4eb9d3 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Greg Kroah-Hartman Sun, 06 Aug 2006 15:44:39 -0700 committer Greg Kroah-Hartman Sun, 06 Aug 2006 15:44:39 -0700 Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/ commit 3a0c56d801df6785b30e36c19e89d7e971c151da tree 03f311351e7ee56f5315f61e23e5ca3bddbe76b2 parent 77d88ee275aeba5da447987f30401bbd4c901ca9 author Michael Reed Mon, 31 Jul 2006 12:19:50 -0500 committer James Bottomley Sun, 06 Aug 2006 15:48:31 -0500 [SCSI] mptfc: correct out of order event processing This patch corrects a problem in mptfc which can result in targets being removed after executing an "lsiutil 99" reset of the fibre channel ports. The last rescan event was being processed before the setup reset work due to an inappropriate optimization in the event processing logic. Every rescan event is now queued for execution and the setup reset work now executes in the proper sequence. Signed-off-by: Michael Reed Acked-by: Moore, Eric Signed-off-by: James Bottomley commit 77d88ee275aeba5da447987f30401bbd4c901ca9 tree 1ede23b8e5ab90fe3aaebfd2dc1f79959c77fd87 parent 3e74051bc7b780c5ba28939f9d5c4cd3280a5ff7 author Michael Reed Mon, 31 Jul 2006 12:19:40 -0500 committer James Bottomley Sun, 06 Aug 2006 15:47:31 -0500 [SCSI] mptfc: properly wait for firmware target discovery to complete Based upon a conversation I had with LSI's fibre channel firmware guru, this patch adds another condition under which the driver waits for the firmware link initialization / target discovery to complete. Signed-off-by: Michael Reed Acked-by: Moore, Eric Signed-off-by: James Bottomley commit 916f3ac680fcc4c142e9acd46161f55533b11760 tree 849b825e4e043ed2207f03bcee222a95244e85ce parent c723e08af18e60cda3bbc90e0d6fb688587aeb9f author Pierre Ossman Sun, 06 Aug 2006 22:22:23 +0200 committer Russell King Sun, 06 Aug 2006 21:44:48 +0100 [MMC] Fix base address configuration in wbsd There were some confusion about base I/O variables in the wbsd driver. Seems like things have been working on shear luck so far. The global 'io' variable (used when manually configuring the resources) was used instead of the local 'base' variable. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 574dc0abab6650c5371df15ac708e48fa25bed89 tree 05b870ed38dd30457817c032e495baeee58fde15 parent ca8c100a00e91cf93782008441a2e159c4b49a25 author Russell King Sun, 06 Aug 2006 20:55:33 +0100 committer Russell King Sun, 06 Aug 2006 20:55:33 +0100 [ARM] Fix Acorn platform SCSI driver build failures SCSI folk forgot to fix up all the uses of 'buffer' before deleting this struct member. Do it for them to rescue the resulting build failures. Signed-off-by: Russell King commit ca8c100a00e91cf93782008441a2e159c4b49a25 tree 6c1cf696f4a19537d07220c6818c92bea1758028 parent 8832157bff28e6559fd38fc18433f8bd8803340a author Russell King Sun, 06 Aug 2006 20:53:40 +0100 committer Russell King Sun, 06 Aug 2006 20:53:40 +0100 [ARM] Fix NCR5380-based SCSI card build The NCR5380-based SCSI cards need the SCSI SPI transport selected to build correctly. Signed-off-by: Russell King commit 3e74051bc7b780c5ba28939f9d5c4cd3280a5ff7 tree c29352e9c87e733c8793e9c1cbff4b226a20a083 parent 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 author Christoph Hellwig Sun, 30 Jul 2006 19:13:36 +0200 committer James Bottomley Sun, 06 Aug 2006 13:19:56 -0500 [SCSI] hptiop: backout ioctl mess The hptiop just got merged with a horrible amount of really bad ioctl code that is against the standards for new scsi drivers. This patch backs it out (and fixes a small bug where scsi_add_host is called to early). We can re-add proper APIs once we agree on them. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 tree 5129fd1abc99d0c58a520938f28bf330ae94ef30 parent 58b3ac07fed31ffc1349380b78305af6522fe1f4 parent 6e1e63259b1e01f047796e7985d960ca040993e6 author James Bottomley Sun, 06 Aug 2006 12:42:33 -0500 committer James Bottomley Sun, 06 Aug 2006 12:42:33 -0500 Merge ../linux-2.6 Conflicts: arch/ia64/hp/sim/simscsi.c Stylistic differences in two separate fixes for buffer->request_buffer problem. Signed-off-by: James Bottomley commit 58b3ac07fed31ffc1349380b78305af6522fe1f4 tree 914cc36a1be51d3f687a19dd326dcb6cc6432320 parent f6c0e7a7b3b6db15146877c0cef43b413af5b76e author Andreas Herrmann Wed, 02 Aug 2006 11:06:21 +0200 committer James Bottomley Sun, 06 Aug 2006 11:31:33 -0500 [SCSI] zfcp: bump version number New version number fo zfcp driver. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit f6c0e7a7b3b6db15146877c0cef43b413af5b76e tree 2ac31f5ea2cd66eb3aff8c6a4584074be407319d parent fea9d6c7bcd8ff1d60ff74f27ba483b3820b18a3 author Andreas Herrmann Wed, 02 Aug 2006 11:05:52 +0200 committer James Bottomley Sun, 06 Aug 2006 11:31:17 -0500 [SCSI] zfcp: minor erp bug fixes Bug fixes for zfcp's erp: - trigger adapter reopen if do_QDIO fails - avoid erp deadlock if registration of scsi target or remote port hang - do not treat as error if exchange port data fails - decrease timeout for target reset and aborts - mark unit failed if slave_destroy is called Additionally some code cleanup was done: - made some functions void when retval is not of interest - shortened initialization of zfcp's host_template - corrected some comments Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit fea9d6c7bcd8ff1d60ff74f27ba483b3820b18a3 tree 9fd3c531809f5b7a275540e5467a59e50b6630b7 parent c2602c48b5ebde55b418ba252737bf60caa4bab0 author Volker Sameske Wed, 02 Aug 2006 11:05:16 +0200 committer James Bottomley Sun, 06 Aug 2006 11:31:00 -0500 [SCSI] zfcp: improve management of request IDs Improve request handling. Use hash table to manage request IDs. Signed-off-by: Volker Sameske Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit c2602c48b5ebde55b418ba252737bf60caa4bab0 tree 81f81fdaf2abec9d1d9f9a68b711196cbca8897d parent b0328beed0786b07d0102ed59cbf0b54ad8f726b author Andrew Vasquez Tue, 01 Aug 2006 13:48:16 -0700 committer James Bottomley Sun, 06 Aug 2006 11:30:41 -0500 [SCSI] qla2xxx: Update version number to 8.01.05-k4. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit b0328beed0786b07d0102ed59cbf0b54ad8f726b tree b3765f6f05f1841e8aabbd7959a0ea48f4bdcc9a parent 45ebeb560570fd7ebae29a4105b81874063d5425 author Vladislav Bolkhovitin Tue, 01 Aug 2006 13:48:15 -0700 committer James Bottomley Sun, 06 Aug 2006 11:30:28 -0500 [SCSI] qla2xxx: Fix to allow to reset devices using sg interface (sg_reset). Currently it is impossible to reset provided by Qlogic QLA2xxx driver SCSI devices externally using corresponding sg devices, particularly via sg_reset utility, because qla2xxx driver in qla2xxx_eh_device_reset() function checks if the input scsi_cmnd has its private data (CMD_SP()) attached. Then the found pointer isn't used anywhere inside of qla2xxx_eh_device_reset(). If the RESET request comes from sg device, it doesn't have such private data. The attached patch removes check for non-NULL CMD_SP() from qla2xxx_eh_device_reset(), hence allows to reset QLA2xxx's devices using corresponding sg devices. AV: change applies to bus/host reset handlers as well. Signed-off-by: Vladislav Bolkhovitin Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 45ebeb560570fd7ebae29a4105b81874063d5425 tree de74b4218a2114f8642db34528b8bd23f2c5868f parent b797b6de9d4d8d085169a507c54b18e74dbe4f21 author Andrew Vasquez Tue, 01 Aug 2006 13:48:14 -0700 committer James Bottomley Sun, 06 Aug 2006 11:30:10 -0500 [SCSI] qla2xxx: Log Trace/Diagonostic asynchronous events. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit b797b6de9d4d8d085169a507c54b18e74dbe4f21 tree 2b9b5a236a780cf780e6655e6e495cb7bf659aa4 parent 416780d3a7836a99568c6728830ced592a7a22e3 author Shyam Sundar Tue, 01 Aug 2006 13:48:13 -0700 committer James Bottomley Sun, 06 Aug 2006 11:29:45 -0500 [SCSI] qla2xxx: Correct endianess problem while issuing a Marker IOCB on ISP24xx. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 416780d3a7836a99568c6728830ced592a7a22e3 tree 521b956eaf8a887f2b93b617a1b02388505583c3 parent dca9479be891eac33e53ab37769e18c3259646da author James Smart Tue, 01 Aug 2006 07:34:16 -0400 committer James Bottomley Sun, 06 Aug 2006 11:29:11 -0500 [SCSI] lpfc 8.1.7 : Change version number to 8.1.8 Change version number to 8.1.8 Signed-off-by: James Smart Signed-off-by: James Bottomley commit dca9479be891eac33e53ab37769e18c3259646da tree 56403501d56019fab9afef00a2eaf6d4133feb55 parent 8f6d98d2e05c38cb08fbda5e38e5f87d361c3cac author James Smart Tue, 01 Aug 2006 07:34:08 -0400 committer James Bottomley Sun, 06 Aug 2006 11:28:55 -0500 [SCSI] lpfc 8.1.7 : ID String and Message fixes ID String and Message fixes - Fix switch symbolic name registration to match cross-OS values - Replace printk's with more standard lpfc_printf_log calls - Make all lpfc_printf_log message numbers unique Signed-off-by: James Smart Signed-off-by: James Bottomley commit 8f6d98d2e05c38cb08fbda5e38e5f87d361c3cac tree a1a35b9134643610667451c2c3ea9a7a4ac1508b parent 1c067a42413c4f39c907443b8f5979cd4d82f0ff author James Smart Tue, 01 Aug 2006 07:34:00 -0400 committer James Bottomley Sun, 06 Aug 2006 11:28:41 -0500 [SCSI] lpfc 8.1.7 : Short bug fixes Short bug fixes: - Fix iocbq list corruption due to missing list_del's in ct handling - Missing unlock in lpfc_sli_next_iotag() - Fix initialization of can_queue value - Differentiate sysfs mailbox errors with different codes. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 1c067a42413c4f39c907443b8f5979cd4d82f0ff tree e799752f33cd731b362e4fe4f039cc3a40c7590c parent a309a6b6e64b8147b7cfe7388237fb83834f58c9 author James Smart Tue, 01 Aug 2006 07:33:52 -0400 committer James Bottomley Sun, 06 Aug 2006 11:28:22 -0500 [SCSI] lpfc 8.1.7 : Fix race condition between lpfc_sli_issue_mbox and lpfc_online Fix race condition between lpfc_sli_issue_mbox and lpfc_online Signed-off-by: James Smart Signed-off-by: James Bottomley commit a309a6b6e64b8147b7cfe7388237fb83834f58c9 tree 6fc55719036a781b65eeb5b6404dcafa3e3f3c88 parent 64ba88182962698a8cb75792372c1dddaef82989 author James Smart Tue, 01 Aug 2006 07:33:43 -0400 committer James Bottomley Sun, 06 Aug 2006 11:28:03 -0500 [SCSI] lpfc 8.1.7 : Fix failing firmware download due to mailbox delays needing to be longer Fix failing firmware download due to mailbox delays needing to be longer. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 64ba88182962698a8cb75792372c1dddaef82989 tree 67520a9f5b946559e4baba69f3cab37a2a7c3a77 parent 0dfda7751e969902f7231fc547ca8c9e0fb9ee13 author James Smart Wed, 02 Aug 2006 15:24:34 -0400 committer James Bottomley Sun, 06 Aug 2006 11:27:31 -0500 [SCSI] lpfc 8.1.7 : Add statistics reset callback for FC transport Signed-off-by: James Smart Signed-off-by: James Bottomley commit 8832157bff28e6559fd38fc18433f8bd8803340a tree fc4dd247011ec8fa74c1940ad5e329e3635ee84b parent 4c756f4e954186630f6ee91a4da9a4b39fe3618d author Russell King Sun, 06 Aug 2006 11:00:45 +0100 committer Russell King Sun, 06 Aug 2006 11:00:45 +0100 [ARM] Fix pci export warnings Remove duplicate PCI exports from ixp4xx machine class. Signed-off-by: Russell King commit 4c756f4e954186630f6ee91a4da9a4b39fe3618d tree 140210451821915d4b3f6f1cd7c06aa62f5beaf3 parent b39239330858bc99b4d529923ec58e95ff6103f8 author Martin Michlmayr Sun, 06 Aug 2006 09:59:26 +0100 committer Russell King Sun, 06 Aug 2006 09:59:26 +0100 [ARM] 3747/1: Fix compilation error in mach-ixp4xx/gtwx5715-setup.c Patch from Martin Michlmayr Fix the following compilation error in arm/mach-ixp4xx/gtwx5715-setup: CC arch/arm/mach-ixp4xx/gtwx5715-setup.o arch/arm/mach-ixp4xx/gtwx5715-setup.c:110: error: expected identifier or '(' before ‘=’ token arch/arm/mach-ixp4xx/gtwx5715-setup.c:121: error: 'gtwx5715_flash_resource' undeclared here (not in a function) arch/arm/mach-ixp4xx/gtwx5715-setup.c: In function 'gtwx5715_init': arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: 'flash_resource' undeclared (first use in this function) arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: (Each undeclared identifier is reported only once arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: for each function it appears in.) make[1]: *** [arch/arm/mach-ixp4xx/gtwx5715-setup.o] Error 1 Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit b39239330858bc99b4d529923ec58e95ff6103f8 tree e82a58619ab19e9b9750a7e806ec9db181c648f3 parent f5d635f649607b09b0b4620d25d028fd2b1b7ea5 author George G. Davis Sun, 06 Aug 2006 09:59:25 +0100 committer Russell King Sun, 06 Aug 2006 09:59:25 +0100 [ARM] 3745/1: Add EXPORT_SYMBOL(rtc_next_alarm_time) to ARM rtctime.c Patch from George G. Davis Fix "WARNING: "rtc_next_alarm_time" [drivers/rtc/rtc-sa1100.ko] undefined!" Signed-off-by: George G. Davis Signed-off-by: Russell King commit c723e08af18e60cda3bbc90e0d6fb688587aeb9f tree 54d5aeb522be373c1cae8b4e41e6d515512999c2 parent f5d635f649607b09b0b4620d25d028fd2b1b7ea5 author Juha [êölä Sun, 06 Aug 2006 09:58:22 +0100 committer Russell King Sun, 06 Aug 2006 09:58:22 +0100 [ARM] 3744/1: MMC: mmcqd gets stuck when block queue is plugged Patch from Juha [êölä When the block queue is plugged, mq->req must be set to NULL. Otherwise mq->req might be left non-NULL, even though mmcqd is not processing a request, thus preventing the MMC queue thread from being woken up when new requests do arrive. Signed-off-by: Juha Yrjola Signed-off-by: Russell King commit c34c07d6946ec8969fa71ba03dbb95091f4eb9d3 tree cc3b2b288177e85d444380e9ed7e149028d04a31 parent bce896984c59bcb0804e9eccc19163dccbff064b parent 558e10a57db10de355ee97712d2b6df49e9b7849 author Greg Kroah-Hartman Sat, 05 Aug 2006 23:22:42 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 23:22:42 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit bce896984c59bcb0804e9eccc19163dccbff064b tree ab63719956f7605967e8705c1e6a357d9b4aa2dc parent 40a64fa8ca3f41a3178e1bdcfe9734c1ba3e175f parent 6cb53e7ed77d429531afa8d822d59909f953a771 author Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:32 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:32 -0700 Merge http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa commit 40a64fa8ca3f41a3178e1bdcfe9734c1ba3e175f tree f61393418c5a17d71aebcec8512a743c0097af2e parent 91a2eb28f0aa1c1425a5999e0cc5f9095f1b2629 parent 2ffc1ccad85e8c2e81a6a4beb390fb4ce143256b author Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:00 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:00 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input commit 91a2eb28f0aa1c1425a5999e0cc5f9095f1b2629 tree b9d8c7200458360fd4b745668e5bea8522f00f18 parent 53c7d2b7706526bf262ac10eb52d602d1520458a parent f5d635f649607b09b0b4620d25d028fd2b1b7ea5 author Greg Kroah-Hartman Sat, 05 Aug 2006 10:48:52 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 10:48:52 -0700 Merge ../torvalds-2.6/ commit 77f3f879387cc5fce6c7a4ca7777c586fe6291cd tree 86cdb66936984d02bd1da3a84deec72fd805400d parent 6543bc0777fadf129d8ee7ac82e0090fb0480403 author Tejun Heo Sat, 05 Aug 2006 03:59:19 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:19 +0900 [PATCH] libata: fix ata_device_add() error path In the error path, ata_device_add() * dereferences null host_set->ports[] element. * calls scsi_remove_host() on not-yet-added shost. This patch fixes both bugs. The first problem was spotted and initial patch submitted by Dave Jones . The second problem was mentioned and fixed by Jeff Garzik in a larger cleanup patch. Cc: Dave Jones Cc: Jeff Garzik Signed-off-by: Tejun Heo commit 6543bc0777fadf129d8ee7ac82e0090fb0480403 tree 6fc9ea06f1d70e3c6553c8ed7bc609914b13668a parent f31e945c50e47b7163c6018928aa93b66e8f22f0 author Jeff Garzik Sat, 05 Aug 2006 03:59:17 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:17 +0900 [PATCH] [libata] manually inline ata_host_remove() (tj: this is for the following ata_device_add() fix) Signed-off-by: Jeff Garzik Signed-off-by: Tejun Heo commit f31e945c50e47b7163c6018928aa93b66e8f22f0 tree 5a18319154ddd1e2a66cc18009daa92eb8cae337 parent f814b75f4ed2ed58cd7bc876a0a9406f984aac6d author Tejun Heo Sat, 05 Aug 2006 03:59:15 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:15 +0900 [PATCH] sata_sil24: don't set probe_ent->mmio_base sata_sil24 doesn't make use of probe_ent->mmio_base and setting this field causes the area to be released twice on detach. Don't set probe_ent->mmio_base. Signed-off-by: Tejun Heo commit f814b75f4ed2ed58cd7bc876a0a9406f984aac6d tree d68255e3203532e98be7ee8afca240205a66e039 parent c3cf30a989efec8144225517e0b2f82c955e3966 author Tejun Heo Sat, 05 Aug 2006 03:59:13 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:13 +0900 [PATCH] ata_piix: fix host_set private_data intialization To get host_set->private_data initialized reliably, all pinfos need to point to the same hpriv. Restore pinfo->private_data after pata pinfo assignment. Signed-off-by: Tejun Heo commit c3cf30a989efec8144225517e0b2f82c955e3966 tree 0f4a134253a6e6d306509d617201dbea346b9536 parent f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 author Tejun Heo Sat, 05 Aug 2006 03:59:11 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:11 +0900 [PATCH] libata: fix ata_port_detach() for old EH ports ata_prot_detach() did nothing for old EH ports and thus SCSI hosts associated with those ports are left dangling after they are detached leaving stale devices and causing oops eventually. Make ata_port_detach() remove SCSI hosts for old EH ports. Signed-off-by: Tejun Heo commit 782a6675119c76c071e74e2ddd98268f47770cba tree 83815eb8984242ec93a632694d0d243ec8ccd691 parent efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 author Herbert Xu Thu, 03 Aug 2006 23:54:41 +1000 committer John W. Linville Fri, 04 Aug 2006 14:57:19 -0400 [PATCH] Send wireless netlink events with a clean slate Drivers expect to be able to call wireless_send_event in arbitrary contexts. On the other hand, netlink really doesn't like being invoked in an IRQ context. So we need to postpone the sending of netlink skb's to a tasklet. Signed-off-by: Herbert Xu Signed-off-by: John W. Linville commit 53c7d2b7706526bf262ac10eb52d602d1520458a tree 8dd9f936ccbcb5479f27edaf7c903fe9826932f2 parent efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 parent 8bcb2839b74d605f5549962a6e69dc07768e95b6 author Greg Kroah-Hartman Thu, 03 Aug 2006 22:44:55 -0700 committer Greg Kroah-Hartman Thu, 03 Aug 2006 22:44:55 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 commit 0dfda7751e969902f7231fc547ca8c9e0fb9ee13 tree 0d63a5a8b48e908edb43bdcdd721b3c3a6893bbb parent 0b4972d59170e13ab0236e8a7148112052590c01 author Christoph Hellwig Fri, 28 Jul 2006 09:01:36 +0200 committer James Bottomley Fri, 28 Jul 2006 13:39:49 -0500 [SCSI] fix simscsi On Thu, Jul 27, 2006 at 01:03:24AM -0700, Andrew Morton wrote: > arch/ia64/hp/sim/simscsi.c: In function `simscsi_sg_readwrite': > arch/ia64/hp/sim/simscsi.c:154: error: structure has no member named `buffer' > arch/ia64/hp/sim/simscsi.c: In function `simscsi_fillresult': > arch/ia64/hp/sim/simscsi.c:247: error: structure has no member named `buffer' > arch/ia64/hp/sim/simscsi.c: At top level: > arch/ia64/hp/sim/simscsi.c:87: warning: 'simscsi_setup' defined but not used Signed-off-by: James Bottomley commit 0b4972d59170e13ab0236e8a7148112052590c01 tree 640bc811d371d245b7259383b0e95ce28c388c2b parent aa677bc7445147f663ebde69d248a30839bada76 author Ju, Seokmann Tue, 25 Jul 2006 08:45:06 -0600 committer James Bottomley Fri, 28 Jul 2006 13:19:12 -0500 [SCSI] megaraid_{mm,mbox}: a fix on "kernel unaligned access address" issue There was an issue in the data structure defined by megaraid driver casuing "kernel unaligned access.." messages to be displayed during IOCTL on IA64 platform. The issue has been reported/fixed by Sakurai Hiroomi [sakurai_hiro@soft.fujitsu.com]. Signed-Off By: Seokmann Ju Signed-off-by: James Bottomley commit aa677bc7445147f663ebde69d248a30839bada76 tree ae8e932655e44c7b16cb1fb23ed929ce9d3bc138 parent fbf6080225a03aa2b3671acacebdf615f1d3f6ba author Ju, Seokmann Tue, 25 Jul 2006 08:44:58 -0600 committer James Bottomley Fri, 28 Jul 2006 13:13:50 -0500 [SCSI] megaraid_{mm,mbox}: a fix on INQUIRY with EVPD With this patch, driver will protect data corruption created by INQUIRY with EVPD request to megaraid controllers. As specified in the changelog, megaraid F/W already has fixed the issue and being under process of release. Meanwhile, driver will protect the system with this patch. Signed-Off By: Seokmann Ju Signed-off-by: James Bottomley commit fbf6080225a03aa2b3671acacebdf615f1d3f6ba tree 8813b1849713b29b52e73bfef8912b7e35b547ea parent f4246b33c774bb4330eb6286beed6d3c9f4373c4 author Ju, Seokmann Tue, 25 Jul 2006 08:44:48 -0600 committer James Bottomley Fri, 28 Jul 2006 13:10:23 -0500 [SCSI] megaraid_{mm,mbox}: 64-bit DMA capability checker This patch contains - a fix for 64-bit DMA capability check in megaraid_{mm,mbox} driver. - includes changes (going back to 32-bit DMA mask if 64-bit DMA mask failes) suggested by James with previous patch. - addition of SATA 150-4/6 as commented by Vasily Averin. With patch, the driver access PCIconfiguration space with dedicated offset to read a signature. If the signature read, it means that the controller has capability to handle 64-bit DMA. Without this patch, the driver used to blindly claim 64-bit DMA capability. The issue has been reported by Vasily Averin [vvs@sw.ru]. Thank you Vasily for the reporting. Signed-Off By: Seokmann Ju Signed-off-by: James Bottomley commit f4246b33c774bb4330eb6286beed6d3c9f4373c4 tree e4a445ade3ecfe190c49757da9a7c4fe8b9bfc13 parent f3ff0c3627df90aa28be98803b10289bb348e4e6 author Mike Christie Mon, 24 Jul 2006 15:47:54 -0500 committer James Bottomley Fri, 28 Jul 2006 11:50:18 -0500 [SCSI] iscsi bugfixes: update and move version number The version info is useful for iscsi tcp, iser and qla4xxx so move to transport class. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit f3ff0c3627df90aa28be98803b10289bb348e4e6 tree a387f0fade78bbcd337ee3ed962b76e92b482705 parent 40527afea1a3b18ee5754e17d6f807176e03f1f2 author Mike Christie Mon, 24 Jul 2006 15:47:50 -0500 committer James Bottomley Fri, 28 Jul 2006 11:50:02 -0500 [SCSI] iscsi bugfixes: fix mem leaks in libiscsi We were leaking some strings. This patch just frees them. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 40527afea1a3b18ee5754e17d6f807176e03f1f2 tree 940bc089d28a5fe37ea2bae4b5532b090d9598e3 parent c8dc1e523b0f1e6dd71cdabd8c7d7587c6dc27f9 author Mike Christie Mon, 24 Jul 2006 15:47:45 -0500 committer James Bottomley Fri, 28 Jul 2006 11:49:50 -0500 [SCSI] iscsi bugfixes: pass errors from complete_pdu to caller Must pass ISCSI_ERR values from the recv path and propogate them upwards. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit c8dc1e523b0f1e6dd71cdabd8c7d7587c6dc27f9 tree 466efa148c152f4330c92f02f81bc72e8f395114 parent 9aaa2b4621280b6de1ecfb6dd7cd5cbe59fd1264 author Mike Christie Mon, 24 Jul 2006 15:47:39 -0500 committer James Bottomley Fri, 28 Jul 2006 11:49:34 -0500 [SCSI] iscsi bugfixes: reduce memory allocations We currently try to allocate a max_recv_data_segment_length which can be very large (default is 64K), and common uses are up to 1MB. It is very very difficult to allocte this much contiguous memory and it turns out we never even use it. We really only need a couple of pages, so this patch has us allocates just what we know what we need today. Later if vendors start adding vendor specific data and we need to handle large buffers we can do this, but for the last 4 years we have not seen anyone do this or request it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 9aaa2b4621280b6de1ecfb6dd7cd5cbe59fd1264 tree 2532d6190f4267bb5233683c5908ef38e1934d12 parent 63f75cc8a7e6ce453e38a7b90cdcae83d63f1ea7 author Mike Christie Mon, 24 Jul 2006 15:47:34 -0500 committer James Bottomley Fri, 28 Jul 2006 11:49:20 -0500 [SCSI] iscsi bugfixes: dont use GFP_KERNEL for sending errors iscsi_tcp can send error events from soft irq context so we cannot use GFP_KERNEL. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 63f75cc8a7e6ce453e38a7b90cdcae83d63f1ea7 tree a85cfe4591f704ba163334c310ce824bff8fa9b5 parent 1c83469d36a9dd30dbf1fb9fc5ca3be3a0e64ff4 author Mike Christie Mon, 24 Jul 2006 15:47:29 -0500 committer James Bottomley Fri, 28 Jul 2006 11:49:01 -0500 [SCSI] iscsi bugfixes: fix oops when removing session We are touching the cls_session after we have freed it. This causes a oops. Signed-off-by: Or Gerlitz Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 1c83469d36a9dd30dbf1fb9fc5ca3be3a0e64ff4 tree d20c53420f6596ebd6500562b294ef820a190887 parent 7ea8b82847293c2311cf08fc3ed31ab0e452a27e author Mike Christie Mon, 24 Jul 2006 15:47:26 -0500 committer James Bottomley Fri, 28 Jul 2006 11:48:32 -0500 [SCSI] iscsi bugfixes: fix oops when iser is flushing io When we enter recovery and flush the running commands we cannot freee the connection before flushing the commands. Some commands may have a reference to the connection that needs to be released before. iscsi_stop was forcing the term and suspend too early and was causing a oops in iser, so this patch removes those callbacks all together and allows the LLD to handle that detail. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 7ea8b82847293c2311cf08fc3ed31ab0e452a27e tree eab8e9be7cc779cc3c9e48774fcb4b33ebb2c8df parent 275fd7d129fdd16d1dc0ec6a8d60bd6b72a76e31 author Mike Christie Mon, 24 Jul 2006 15:47:22 -0500 committer James Bottomley Fri, 28 Jul 2006 11:48:16 -0500 [SCSI] iscsi bugfixes: fix abort handling Abort handler fixes. If a connection is dropped and reconnected while an abort is running then we should assume the recovery code will clean up the abort. Not doing so causes a oops. And if a command completes then we get the status for the abort, we do not need to call into the LLD to cleanup the resources. Doing this causes and oops in iser because it ends up freeing some resources twice. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 275fd7d129fdd16d1dc0ec6a8d60bd6b72a76e31 tree e87776f201ceef9a53ec7c74ae65fe465d2e0829 parent b6c395ed0387c824ddf125d3b74b576a2575c149 author Mike Christie Mon, 24 Jul 2006 15:47:17 -0500 committer James Bottomley Fri, 28 Jul 2006 11:48:01 -0500 [SCSI] iscsi bugfixes: handle data rsp errors if iscsi_data_rsp fails we must bail out. Since the pdu values like data length are invalid we cannot continue to process the data since it could over run buffers. This fixes a bug with cisco 5428s where that target is sending too much data. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit b6c395ed0387c824ddf125d3b74b576a2575c149 tree 76ca5cd982063335088384622e5033401bbc5057 parent d82967c70658a408ea6cae5dc989ba8b2c0999e1 author Mike Christie Mon, 24 Jul 2006 15:47:15 -0500 committer James Bottomley Fri, 28 Jul 2006 11:47:40 -0500 [SCSI] iscsi bugfixes: fix r2t handling The iscsi tcp code can pluck multiple rt2s from the tasks's r2tqueue in the xmit code. This can result in the task being queued on the xmit queue but gettting completed at the same time. This patch fixes the above bug by making the fifo a list so we always remove the entry on the list del. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit d82967c70658a408ea6cae5dc989ba8b2c0999e1 tree 0ea99ac94283f01d14e40272fb403935533f15d4 parent 8d4fbd3f978ba49498dc7c6430368c4ff86a09fc author Mike Christie Mon, 24 Jul 2006 15:47:11 -0500 committer James Bottomley Fri, 28 Jul 2006 11:47:23 -0500 [SCSI] iscsi bugfixes: send correct error values to userspace In the xmit patch we are sending a -EXXX value to iscsi_conn_failure which is causing userspace to get confused. We should be sending a ISCSI_ERR_* value that userspace understands. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8d4fbd3f978ba49498dc7c6430368c4ff86a09fc tree b581ea0d3dae4c2926219e339f4cc45b9e94e829 parent b2b3c121076961333977f485f0d54c22121df920 author HighPoint Linux Team Mon, 24 Jul 2006 15:48:54 +0800 committer James Bottomley Fri, 28 Jul 2006 11:47:02 -0500 [SCSI] hptiop: wrong register used in hptiop_reset_hba() IOP reset message should be posted to inbound message register instead of outbound message register. Signed-off-by: HighPoint Linux Team Signed-off-by: James Bottomley commit b2b3c121076961333977f485f0d54c22121df920 tree db121bd6a5231bb2b34038064d5c2bb93e05fbfb parent 64821324ca49f24be1a66f2f432108f96a24e596 author Grant Grundler Mon, 17 Jul 2006 07:22:45 -0600 committer James Bottomley Fri, 28 Jul 2006 11:46:38 -0500 [SCSI] sym2: claim only "Storage" class The follow patch fixes a problem for Matt Taggart. The Compaq system he had (dl380?) has a SmartArray device that exposes the 53c1510 device in both RAID and "normal" modes. The difference is in RAID mode, the smart array driver (IIRC) should claim the device instead of sym2 driver. Patch below prevents sym2 from claiming the device when the RAID "daughter board" is attached. Signed-off-by: Grant Grundler Signed-off-by: James Bottomley commit 8bcb2839b74d605f5549962a6e69dc07768e95b6 tree 3cb69aeaedc8444ed91882ac63714b52a2df6836 parent 115ff50bade0f93a288677745a5884def6cbf9b1 author Dave Kleikamp Fri, 28 Jul 2006 08:46:05 -0500 committer Dave Kleikamp Fri, 28 Jul 2006 08:46:05 -0500 JFS: Fix bug in quota code. tmp_bh.b_size must be initialized Signed-off-by: Dave Kleikamp commit 5b9c9bf6c92274a6eb74fc8f86586ab592a7a1ec tree 49acad6db9d3a81af5d5ebd876c0983274a7e641 parent 9805cb76f7bcd3108e012270d9ef2fd8ea3bea55 author Kristen Carlson Accardi Wed, 26 Jul 2006 13:59:00 -0400 committer Len Brown Wed, 26 Jul 2006 16:58:11 -0400 ACPI: add Dock Station driver to MAINTAINERS file Signed-off-by: Kristen Carlson Accardi Signed-off-by: Len Brown commit 115ff50bade0f93a288677745a5884def6cbf9b1 tree a646404a99d0587ea0113a2c6dad71d7854a84d4 parent 64821324ca49f24be1a66f2f432108f96a24e596 author Dave Kleikamp Wed, 26 Jul 2006 14:52:13 -0500 committer Dave Kleikamp Wed, 26 Jul 2006 14:52:13 -0500 JFS: Quota support broken, no quota_read and quota_write jfs_quota_read/write are very near duplicates of ext2_quota_read/write. Cleaned up jfs_get_block as long as I had to change it to be non-static. Signed-off-by: Dave Kleikamp commit 16a74744231e57e354253567490ab9e4ccd2d605 tree f1706a2217f91202f01fd34be820a0d88071815d parent b4e54de8d34afe7fcf08bfe91070d9dfeae6ed27 author Bjorn Helgaas Wed, 05 Apr 2006 08:47:00 -0400 committer Len Brown Wed, 26 Jul 2006 01:19:26 -0400 PCI: quirk to disable e100 interrupt if RESET failed to Without this quirk, e100 can be pulling on a shared interrupt line when another device (eg. USB) loads, causing the interrupt to scream and get disabled. http://bugzilla.kernel.org/show_bug.cgi?id=5918 Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 9805cb76f7bcd3108e012270d9ef2fd8ea3bea55 tree e046dff9f431183f86ed43b83776cdef2750d649 parent 9b6d97b64eff08b368375efcf9c1d01eba582ea2 author Len Brown Tue, 25 Jul 2006 13:30:57 -0400 committer Len Brown Tue, 25 Jul 2006 13:30:57 -0400 ACPI: restore some dmesg to DEBUG-only, ala 2.6.17 The ACPI_EXCEPTION() patch enabled a bunch of messages to print even in the non-DEBUG kernel. Need to change a couple back, and note that ACPI_EXCEPTION takes no \n, but ACPI_DEBUG_PRINT does. No context for object [%p]\n Device `[%s]' is not power manageable\n Signed-off-by: Len Brown commit 9b6d97b64eff08b368375efcf9c1d01eba582ea2 tree 5fbb5ee62e4e28d9c7d6cd80aa8b6b0bcd071b91 parent d568df84f987a9321c1f5826a6c8678ef2bb2b70 author Randy Dunlap Wed, 12 Jul 2006 02:08:00 -0400 committer Len Brown Wed, 12 Jul 2006 12:51:18 -0400 ACPI: scan: handle kset/kobject errors Check and handle kset_register() and kobject_register() init errors. Signed-off-by: Randy Dunlap Signed-off-by: Len Brown commit d568df84f987a9321c1f5826a6c8678ef2bb2b70 tree 5b67aaf1b2a66cf1c84a08dafff2cff8b65a1c21 parent 7c3dec0679c66ce177726802adbe2f403942fc27 author Randy Dunlap Wed, 12 Jul 2006 01:47:00 -0400 committer Len Brown Wed, 12 Jul 2006 02:39:12 -0400 ACPI: handle firmware_register init errors Signed-off-by: Randy Dunlap Signed-off-by: Len Brown