commit 27162bf76c8e1d20f81ba53c356ca8681aa90461 Author: Chris Wright Date: Thu Jun 29 17:17:23 2006 -0700 Linux 2.6.17.2 commit 988bc3337ebc15c7c6078d3263b0599bc744d693 Author: Richard Purdie Date: Tue Jun 27 01:25:35 2006 -0400 [PATCH] Input: return correct size when reading modalias attribute Input: return correct size when reading modalias attribute Signed-off-by: Richard Purdie Signed-off-by: Dmitry Torokhov Signed-off-by: Chris Wright commit 26992852dde78e6acc9a9b2bdc9e734428e34d65 Author: Sonny Rao Date: Sun Jun 25 05:49:34 2006 -0700 [PATCH] idr: fix race in idr code From: Sonny Rao I ran into a bug where the kernel died in the idr code: cpu 0x1d: Vector: 300 (Data Access) at [c000000b7096f710] pc: c0000000001f8984: .idr_get_new_above_int+0x140/0x330 lr: c0000000001f89b4: .idr_get_new_above_int+0x170/0x330 sp: c000000b7096f990 msr: 800000000000b032 dar: 0 dsisr: 40010000 current = 0xc000000b70d43830 paca = 0xc000000000556900 pid = 2022, comm = hwup 1d:mon> t [c000000b7096f990] c0000000000d2ad8 .expand_files+0x2e8/0x364 (unreliable) [c000000b7096faa0] c0000000001f8bf8 .idr_get_new_above+0x18/0x68 [c000000b7096fb20] c00000000002a054 .init_new_context+0x5c/0xf0 [c000000b7096fbc0] c000000000049dc8 .copy_process+0x91c/0x1404 [c000000b7096fcd0] c00000000004a988 .do_fork+0xd8/0x224 [c000000b7096fdc0] c00000000000ebdc .sys_clone+0x5c/0x74 [c000000b7096fe30] c000000000008950 .ppc_clone+0x8/0xc -- Exception: c00 (System Call) at 000000000fde887c SP (f8b4e7a0) is in userspace Turned out to be a race-condition and NULL ptr deref, here's my fix: Users of the idr code are supposed to call idr_pre_get without locking, so the idr code must serialize itself with respect to layer allocations. However, it fails to do so in an error path in idr_get_new_above_int(). I added the missing locking to fix this. Signed-off-by: Sonny Rao Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit c4389daed17fb3d6ec54f2759e2705c268828899 Author: Anton Blanchard Date: Sun Jun 25 05:48:44 2006 -0700 [PATCH] Link error when futexes are disabled on 64bit architectures From: Anton Blanchard If futexes are disabled we fail to link on ppc64. Signed-off-by: Anton Blanchard Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit 6bd6b5c7d81c365b53ff40f9c049e19aa104f6ac Author: Nickolay Date: Fri Jun 9 21:24:14 2006 +0400 [PATCH] kbuild: bugfix with initramfs This patch fix double inclusion of ramfs-input. Signed-off-by: Nickolay Vinogradov Signed-off-by: Sam Ravnborg Signed-off-by: Chris Wright commit 27877d06fea98a4ae485250db523bb5eea27235c Author: Al Boldi Date: Mon Jun 26 00:26:13 2006 -0700 [PATCH] ide-io: increase timeout value to allow for slave wakeup During an STR resume cycle, the ide master disk times-out when there is also a slave present (especially CD). Increasing the timeout in ide-io from 10,000 to 100,000 fixes this problem. Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit f92b235f72be34e66357df72794f2baa0221524d Author: Tejun Heo Date: Fri Jun 23 12:49:52 2006 +0800 [PATCH] libata: minor patch for ATA_DFLAG_PIO Problem: - With 2.6.17 libata, some PIO-only devices are given DMA commands. Changes: - Do not clear the ATA_DFLAG_PIO flag in ata_dev_configure(). Signed-off-by: Tejun Heo Signed-off-by: Albert Lee Signed-off-by: Chris Wright commit 4f75bf81d40d4c5b459343ef34d05478b8bed47d Author: Robert Hancock Date: Thu Jun 22 20:33:26 2006 -0600 [PATCH] ohci1394: Fix broken suspend/resume in ohci1394 I've been experimenting to track down the cause of suspend/resume problems on my Compaq Presario X1050 laptop: http://bugzilla.kernel.org/show_bug.cgi?id=6075 Essentially the ACPI Embedded Controller and keyboard controller would get into a bizarre, confused state after resume. I found that unloading the ohci1394 module before suspend and reloading it after resume made the problem go away. Diffing the dmesg output from resume, with and without the module loaded, I found that with the module loaded I was missing these: PM: Writing back config space on device 0000:02:00.0 at offset 1. (Was 2100080, writing 2100007) PM: Writing back config space on device 0000:02:00.0 at offset 3. (Was 0, writing 8008) PM: Writing back config space on device 0000:02:00.0 at offset 4. (Was 0, writing 90200000) PM: Writing back config space on device 0000:02:00.0 at offset 5. (Was 1, writing 2401) PM: Writing back config space on device 0000:02:00.0 at offset f. (Was 20000100, writing 2000010a) The default PCI driver performs the pci_restore_state when no driver is loaded for the device. When the ohci1394 driver is loaded, it is supposed to do this, however it appears not to do so. I created the patch below and tested it, and it appears to resolve the suspend problems I was having with the module loaded. I only added in the pci_save_state and pci_restore_state - however, though I know little of this hardware, surely the driver should really be doing more than this when suspending and resuming? Currently it does almost nothing, what if there are commands in progress, etc? Signed-off-by: Robert Hancock Signed-off-by: Chris Wright commit e778d0ec93ec97fb851b8e0bd5e1488f083baa6a Author: YOSHIFUJI Hideaki Date: Thu Jun 22 01:42:13 2006 -0700 [PATCH] IPV6 ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY We need to update hiscore.rule even if we don't enable CONFIG_IPV6_PRIVACY, because we have more less significant rule; longest match. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit ac16ac4c1202baff72f889f3904ca480bea93d76 Author: Łukasz Stelmach Date: Thu Jun 22 01:39:05 2006 -0700 [PATCH] IPV6: Fix source address selection. Two additional labels (RFC 3484, sec. 10.3) for IPv6 addreses are defined to make a distinction between global unicast addresses and Unique Local Addresses (fc00::/7, RFC 4193) and Teredo (2001::/32, RFC 4380). It is necessary to avoid attempts of connection that would either fail (eg. fec0:: to 2001:feed::) or be sub-optimal (2001:0:: to 2001:feed::). Signed-off-by: Łukasz Stelmach Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit e0072c1bbbdcb819e8df0a67229bb9eed2accec3 Author: Jeff Dike Date: Tue Jun 20 18:25:03 2006 -0400 [PATCH] UML: fix uptime The use of signed instead of unsigned here broke the calculations on negative numbers that are involved in calculating wall_to_monotonic. Signed-off-by: Jeff Dike Signed-off-by: Chris Wright commit e45424909c0a8ffc7afbea6e35da582f782fc618 Author: Michael Buesch Date: Sun Jun 18 19:05:10 2006 +0200 [PATCH] bcm43xx: init fix for possible Machine Check Place the Init-vs-IRQ workaround before any card register access, because we might not have the wireless core mapped at all times in init. So this will result in a Machine Check caused by a bus error. Signed-off-by: Michael Buesch Signed-off-by: Chris Wright commit 5cb91c1a730874dd915eba983996b3e45378e39b Author: Kirill Smelkov Date: Tue Jun 20 00:32:01 2006 -0700 [PATCH] x86: compile fix for asm-i386/alternatives.h compile fix: needs for 'u8' -- just look at struct alt_instr. My module includes as the first header, and as of 2.6.17 this leads to compilation errors. Signed-off-by: Kirill Smelkov Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit 323e290abcbdf84afde0fbbd775f3ba4b784655a Author: Anton Altaparmakov Date: Tue Jun 20 00:29:41 2006 -0700 [PATCH] NTFS: Critical bug fix (affects MIPS and possibly others) It fixes a crash in NTFS on architectures where flush_dcache_page() is a real function. I never noticed this as all my testing is done on i386 where flush_dcache_page() is NULL. http://bugzilla.kernel.org/show_bug.cgi?id=6700 Many thanks to Pauline Ng for the detailed bug report and analysis! Signed-off-by: Anton Altaparmakov Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit 50cdbb604d8e4f38c30e387ef28433a02b91e6f1 Author: David Miller Date: Tue Jun 20 00:44:27 2006 -0700 [PATCH] SPARC32: Fix iommu_flush_iotlb end address Fix the calculation of the end address when flushing iotlb entries to ram. This bug has been a cause of esp dma errors, and it affects HyperSPARC systems much worse than SuperSPARC systems. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit 94f37cf0a304c16dcf86ec542e88b5448b2edfb7 Author: Herbert Xu Date: Tue Jun 20 00:09:30 2006 -0700 [PATCH] ETHTOOL: Fix UFO typo The function ethtool_get_ufo was referring to ETHTOOL_GTSO instead of ETHTOOL_GUFO. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit c2ba44b229b04cbd57106107d0047e2c666040ce Author: Neil Horman Date: Tue Jun 20 00:09:03 2006 -0700 [PATCH] SCTP: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. In the event that our entire receive buffer is full with a series of chunks that represent a single gap-ack, and then we accept a chunk (or chunks) that fill in the gap between the ctsn and the first gap, we renege chunks from the end of the buffer, which effectively does nothing but move our gap to the end of our received tsn stream. This does little but move our missing tsns down stream a little, and, if the sender is sending sufficiently large retransmit frames, the result is a perpetual slowdown which can never be recovered from, since the only chunk that can be accepted to allow progress in the tsn stream necessitates that a new gap be created to make room for it. This leads to a constant need for retransmits, and subsequent receiver stalls. The fix I've come up with is to deliver the frame without reneging if we have a full receive buffer and the receiving sockets sk_receive_queue is empty(indicating that the receive buffer is being blocked by a missing tsn). Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit f0a0819784268d7ca479b4538b07124249137500 Author: Tsutomu Fujii Date: Tue Jun 20 00:08:29 2006 -0700 [PATCH] SCTP: Send only 1 window update SACK per message. Right now, every time we increase our rwnd by more then MTU bytes, we trigger a SACK. When processing large messages, this will generate a SACK for almost every other SCTP fragment. However since we are freeing the entire message at the same time, we might as well collapse the SACK generation to 1. Signed-off-by: Tsutomu Fujii Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit ac3e4adefd766840f20e7cad6aa430f3fb491c4d Author: David Miller Date: Tue Jun 20 00:06:27 2006 -0700 [PATCH] SCTP: Reset rtt_in_progress for the chunk when processing its sack. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit 8cd8533a381af92ff3febeb0ab82b4d145be1257 Author: Vlad Yasevich Date: Tue Jun 20 00:04:53 2006 -0700 [PATCH] SCTP: Reject sctp packets with broadcast addresses. Make SCTP handle broadcast properly Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit 617495463a301a956990b87913849dd740e58bcf Author: Vlad Yasevich Date: Tue Jun 20 00:04:18 2006 -0700 [PATCH] SCTP: Limit association max_retrans setting in setsockopt. When using ASSOCINFO socket option, we need to limit the number of maximum association retransmissions to be no greater than the sum of all the path retransmissions. This is specified in Section 7.1.2 of the SCTP socket API draft. However, we only do this if the association has multiple paths. If there is only one path, the protocol stack will use the assoc_max_retrans setting when trying to retransmit packets. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit f67656ad55536533ebc33e3154184aeb53b379b8 Author: Tushar Gohad Date: Tue Jun 20 00:03:34 2006 -0700 [PATCH] PFKEYV2: Fix inconsistent typing in struct sadb_x_kmprivate. Fixes inconsistent use of "uint32_t" vs. "u_int32_t". Fix pfkeyv2 userspace builds. Signed-off-by: Tushar Gohad Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit 8fbc89242905b7645064d6946ac86d4bd77c55c5 Author: YOSHIFUJI Hideaki Date: Tue Jun 20 00:02:51 2006 -0700 [PATCH] IPV6: Sum real space for RTAs. This patch fixes RTNLGRP_IPV6_IFINFO netlink notifications. Issue pointed out by Patrick McHardy . Signed-off-by: YOSHIFUJI Hideaki Acked-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit 9baa5f6d7e59d7aecf4c17cc5ac9a162e65e1f72 Author: Stuart MacDonald Date: Wed May 31 13:28:40 2006 -0400 [PATCH] USB: Whiteheat: fix firmware spurious errors Attached patch fixes spurious errors during firmware load. Signed-off-by: Stuart MacDonald Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright