commit a3a5ab881318c2d7b6df3d176cdabacd1d16e5e6 Author: Chris Wright Date: Mon Jun 5 10:18:23 2006 -0700 Linux 2.6.16.20 commit fb0a8c49132586bfe44e437ccfae960ad7988fc8 Author: Stefan Richter Date: Sat Jun 3 02:00:33 2006 +0200 [PATCH] sbp2: fix check of return value of hpsb_allocate_and_register_addrspace I added a failure check in patch "sbp2: variable status FIFO address (fix login timeout)" --- alas for a wrong error value. This is a bug since Linux 2.6.16. Leads to NULL pointer dereference if the call failed, and bogus failure handling if call succeeded. Signed-off-by: Stefan Richter Signed-off-by: Chris Wright commit 9e5bd023df09e57692a87aba78d9ddee1888a559 Author: Stefan Richter Date: Fri Jun 2 19:34:30 2006 +0200 [PATCH] sbp2: backport read_capacity workaround for iPod There is a firmware bug in several Apple iPods which prevents access to these iPods under certain conditions. The disk size reported by the iPod is one sector too big. Once access to the end of the disk is attempted, the iPod becomes inaccessible. This problem has been known for USB iPods for some time and has recently been discovered to exist with FireWire/USB combo iPods too. This patch is derived from the fix in Linux 2.6.17, commit e9a1c52c7b19d10342226c12f170d7ab644427e2, to be applicable to 2.6.16.x without prerequisite patches. It hard-wires a workaround for three known affected model numbers (those of 4th generation iPod, iPod Photo, iPod mini). Note: This patch lacks Linux 2.6.17's ability to enable and disable the workaround via a module parameter. Signed-off-by: Stefan Richter Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit d989306d6ac532795e225ad5303dfe4e4a81f51e Author: Andi Kleen Date: Thu Jun 1 03:26:58 2006 +0200 [PATCH] x86_64: Don't do syscall exit tracing twice This fixes a regression from the earlier DOS fix for non canonical IRET addresses. It broke UML. int_ret_from_syscall already does syscall exit tracing, so no need to do it again in the caller. This caused problems for UML and some other special programs doing syscall interception. Signed-off-by: Andi Kleen Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit d0252619737f158577225b3a596af573428c6da1 Author: Vivek Goyal Date: Tue Apr 18 12:35:13 2006 +0200 [PATCH] x86_64: x86_64 add crashdump trigger points o Start booting into the capture kernel after an Oops if system is in a unrecoverable state. System will boot into the capture kernel, if one is pre-loaded by the user, and capture the kernel core dump. o One of the following conditions should be true to trigger the booting of capture kernel. - panic_on_oops is set. - pid of current thread is 0 - pid of current thread is 1 - Oops happened inside interrupt context. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright commit dd84d30a6b37ed8c3d3a328854db4f2c66979bab Author: Zhu Yi Date: Thu Mar 2 05:55:51 2006 +0800 [PATCH] ipw2200: Filter unsupported channels out in ad-hoc mode Currently iwlist ethX freq[uency]/channel lists all the channels the card supported for the current region, which includes some channels can only be used in infrastructure mode. This patch filters these channels out if the card is currently in ad-hoc mode. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright commit 17c384f205082ddfc1bf8bb3cfa63194b7aac5e7 Author: Mark Lord Date: Sun May 28 11:28:00 2006 -0400 [PATCH] the latest consensus libata resume fix Okay, just to sum things up. This forces libata to wait for up to 2 seconds for BUSY|DRQ to clear on resume before continuing. [jgarzik adds...] During testing we never saw DRQ asserted, but nonetheless (a) this works and (b) testing for DRQ won't hurt. Signed-off-by: Mark Lord Acked-by: Jens Axboe Signed-off-by: Jeff Garzik Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 822dee3afa4f03fc3fa89e5d5794143a909c4e6f Author: Stefan Richter Date: Sat May 27 14:11:18 2006 +0200 [PATCH] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices Re-enable posted writes for status FIFO. Besides bringing back a very minor bandwidth tweak from Linux 2.6.15.x and older, this also fixes an interoperability regression since 2.6.16: http://bugzilla.kernel.org/show_bug.cgi?id=6356 (sbp2: scsi_add_device failed. IEEE1394 HD is not working anymore.) Signed-off-by: Stefan Richter Tested-by: Vanei Heidemann Tested-by: Martin Putzlocher (chip type unconfirmed) Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit a272f5969539c7a68b879b882c3e1637396216aa Author: Dmitry Torokhov Date: Sat Apr 29 05:12:44 2006 -0400 [PATCH] Input: psmouse - fix new device detection logic Input: psmouse - fix new device detection logic Reported to fix http://bugs.gentoo.org/130846 Signed-off-by: Dmitry Torokhov Cc: Daniel Drake Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 0599c8ca5cf14f8bc8344d6603886b13fc723c6b Author: Johannes Berg Date: Thu May 25 18:44:24 2006 -0700 [PATCH] PowerMac: force only suspend-to-disk to be valid For a very long time, echoing 'standby' or 'mem' into /sys/power/state has killed the machine on powerpc. This patch fixes that. This patch adds the .valid callback to pm_ops on PowerMac so that only the suspend to disk state can be entered. Note that just returning 0 would suffice since the upper layers don't pass PM_SUSPEND_DISK down, but we handle it there regardless just in case that changes. Acked-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit e81ccf5afaf9cff1ed27c29ff96795c146a3d571 Author: Paul Jackson Date: Mon May 22 17:56:07 2006 -0700 [PATCH] Cpuset: might sleep checking zones allowed fix Fix an infrequently encountered 'sleeping function called from invalid context' in the cpuset hooks in __alloc_pages. Could sleep while interrupts disabled. The routine cpuset_zone_allowed() is called by code in mm/page_alloc.c __alloc_pages() to determine if a zone is allowed in the current tasks cpuset. This routine can sleep, for certain GFP_KERNEL allocations, if the zone is on a memory node not allowed in the current cpuset, but might be allowed in a parent cpuset. But we can't sleep in __alloc_pages() if in interrupt, nor if called for a GFP_ATOMIC request (__GFP_WAIT not set in gfp_flags). The rule was intended to be: Don't call cpuset_zone_allowed() if you can't sleep, unless you pass in the __GFP_HARDWALL flag set in gfp_flag, which disables the code that might scan up ancestor cpusets and sleep. This rule was being violated due to a bogus change made (by myself, pj) to __alloc_pages() as part of the November 2005 effort to cleanup its logic. The bogus change can be seen at: http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-11/4691.html [PATCH 01/05] mm fix __alloc_pages cpuset ALLOC_* flags This was first noticed on a tight memory system, in code that was disabling interrupts and doing allocation requests with __GFP_WAIT not set, which resulted in __might_sleep() writing complaints to the log "Debug: sleeping function called ...", when the code in cpuset_zone_allowed() tried to take the callback_sem cpuset semaphore. Special thanks to Dave Chinner, for figuring this out, and a tip of the hat to Nick Piggin who warned me of this back in Nov 2005, before I was ready to listen. Signed-off-by: Paul Jackson Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit 3e211bbe2295ff89490f01d54c6300a8a58fac7c Author: Pat Gefre Date: Mon May 1 12:16:08 2006 -0700 [PATCH] Altix: correct ioc3 port order Currently loading the ioc3 as a module will cause the ports to be numbered in reverse order. This mod maintains the proper order of cards for port numbering. Signed-off-by: Patrick Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright commit 3798162e57c105e6cc9f90dbd03721d34bae2162 Author: Brent Casavant Date: Wed May 3 19:55:10 2006 -0700 [PATCH] Altix: correct ioc4 port order Currently loading the ioc4 as a module will cause the ports to be numbered in reverse order. This mod maintains the proper order of cards for port numbering. Signed-off-by: Brent Casavant Cc: Pat Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright