commit 86b74fc0fc26a58b6a93a4e57eae7989dcfbf305 Author: Greg Kroah-Hartman Date: Wed Oct 10 10:50:35 2007 -0700 Linux 2.6.22.10 commit a39ebeebe475be5d22aa1f2aeb7ae95c3efe9cd7 Author: Trond Myklebust Date: Tue Oct 9 10:55:45 2007 -0400 NLM: Fix a memory leak in nlmsvc_testlock changeset a6d85430424d44e946e0946bfaad607115510989 in upstream The recent fix for a circular lock dependency unfortunately introduced a potential memory leak in the event where the call to nlmsvc_lookup_host fails for some reason. Thanks to Roel Kluin for spotting this. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit b44da25c30867fa71f2cec3334ecfa1e9412dab4 Author: Andi Kleen Date: Fri Aug 10 22:31:07 2007 +0200 i386: Use global flag to disable broken local apic timer on AMD CPUs. commit d3f7eae182b04997be19343a23f7009170f4f7a5 upstream The Averatec 2370 and some other Turion laptop BIOS seems to program the ENABLE_C1E MSR inconsistently between cores. This confuses the lapic use heuristics because when C1E is enabled anywhere it seems to affect the complete chip. Use a global flag instead of a per cpu flag to handle this. If any CPU has C1E enabled disabled lapic use. Thanks to Cal Peake for debugging. Cc: tglx@linutronix.de Cc: Chuck Ebbert Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 880da58fc49a4e021d49b4aeae3b2c6b51e211fa Author: Stephen Smalley Date: Wed Aug 29 08:51:50 2007 -0400 SELinux: clear parent death signal on SID transitions commit 4ac212ad4e8fafc22fa147fc255ff5fa5435cf33 upstream. Clear parent death signal on SID transitions to prevent unauthorized signaling between SIDs. Signed-off-by: Stephen Smalley Acked-by: Eric Paris Signed-off-by: James Morris Signed-off-by: Greg Kroah-Hartman commit ceda57cf82ec93444e7d86755e6d43ab11c1b50d Author: Anton Blanchard Date: Sun Oct 7 00:24:31 2007 -0700 Fix timer_stats printout of events/sec commit 74922be1485818ed368c4cf4f0b100f70bf01e08 upstream. When using /proc/timer_stats on ppc64 I noticed the events/sec field wasnt accurate. Sometimes the integer part was incorrect due to rounding (we werent taking the fractional seconds into consideration). The fraction part is also wrong, we need to pad the printf statement and take the bottom three digits of 1000 times the value. Signed-off-by: Anton Blanchard Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 433d028c427f90a2ab38b6eab752e19cd1ac9981 Author: Mark Lord Date: Mon Oct 1 01:20:10 2007 -0700 Fix SMP poweroff hangs commit 4047727e5ae33f9b8d2b7766d1994ea6e5ec2991 from upstream We need to disable all CPUs other than the boot CPU (usually 0) before attempting to power-off modern SMP machines. This fixes the hang-on-poweroff issue on my MythTV SMP box, and also on Thomas Gleixner's new toybox. Signed-off-by: Mark Lord Acked-by: Thomas Gleixner Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 2c0cf342f6fc11e6de814464c035a37d8c17fb17 Author: Trond Myklebust Date: Tue Sep 25 15:56:00 2007 -0400 NLM: Fix a circular lock dependency in lockd commit 255129d1e9ca0ed3d69d5517fae3e03d7ab4b806 in upstream. The problem is that the garbage collector for the 'host' structures nlm_gc_hosts(), holds nlm_host_mutex while calling down to nlmsvc_mark_resources, which, eventually takes the file->f_mutex. We cannot therefore call nlmsvc_lookup_host() from within nlmsvc_create_block, since the caller will already hold file->f_mutex, so the attempt to grab nlm_host_mutex may deadlock. Fix the problem by calling nlmsvc_lookup_host() outside the file->f_mutex. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit b73222fc44b587f1dbf08e3c47370735ef0e67f7 Author: David Brownell Date: Thu Sep 27 15:17:25 2007 +0200 i2c-algo-bit: Read block data bugfix In Linus tree already: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=939bc4943d0483961edc45b63a7d27b4ffe547e3 This fixes a bug in the way i2c-algo-bit handles I2C_M_RECV_LEN, used to implement i2c_smbus_read_block_data(). Previously, in the absence of PEC (rarely used!) it would NAK the "length" byte: S addr Rd [A] [length] NA That prevents the subsequent data bytes from being read: S addr Rd [A] [length] { A [data] }* NA The primary fix just reorders two code blocks, so the length used in the "should I NAK now?" check incorporates the data which it just read from the slave device. However, that move also highlighted other fault handling glitches. This fixes those by abstracting the RX path ack/nak logic, so it can be used in more than one location. Signed-off-by: David Brownell Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit d69fedce483a75ea59fedda08aba9123adc92e80 Author: Michal Schmidt Date: Fri Sep 28 15:52:46 2007 -0700 Fix ppp_mppe kernel stack usage. commit 45dfd5b5dd20f17fe23dafc5cfe921474d27f849 from upstream Signed-off-by: Michal Schmidt Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 3486d1c0e03c6df55ca741f74e4a561a3022698b Author: Chuck Ebbert Date: Fri Sep 28 15:29:32 2007 -0400 libata: update drive blacklists Update the libata drive blacklists to the latest in 2.6.23-rc8. Signed-off-by: Chuck Ebbert Cc: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit ef24adc26f1c2712b9bc759116b30f721a7a5b61 Author: Stephen Hemminger Date: Fri Sep 28 09:48:14 2007 -0700 sky2: fix transmit state on resume Already upstream. After resume, driver has reset the chip so the current state of transmit checksum offload state machine and DMA state machine will be undefined. The fix is to set the state so that first Tx will set MSS and offset values. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit dc8a4bca289e51866f01a41a29793199cd0e28f0 Author: Stephen Hemminger Date: Fri Sep 28 09:48:13 2007 -0700 sky2: fix VLAN receive processing Already upstream. The length check for truncated frames was not correctly handling the case where VLAN acceleration had already read the tag. Also, the Yukon EX has some features that use high bit of status as security tag. Signed-off-by: Pierre-Yves Ritschard Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 294bb426fa9eae8fc3af3759787b7b92107fc2ce Author: Stephen Hemminger Date: Fri Sep 28 09:48:12 2007 -0700 sky2: reduce impact of watchdog timer This is the 2.6.22 version of a regression fix that is already in 2.6.23. Change the watchdog timer form 10 per second all the time, to 1 per second and only if interface is up. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 785e6af1f1234e0fcf4dfa5c884b0703f3ce45e1 Author: James Bottomley Date: Thu Sep 27 18:51:57 2007 -0400 scsi_transport_spi: fix domain validation failure from incorrect width setting commit 2302827c95fe0f441025acd5133e532d2eef322b from upstream Domain Validation in the SPI transport class is failing on boxes with damaged cables (and failing to the extent that the box hangs). The problem is that the first test it does is a cable integrity test for wide transfers and if this fails, it turns the wide bit off. The problem is that the next set of tests it does turns wide back on again, with the result that it runs through the entirety of DV with a known bad setting and then hangs the system. The attached patch fixes the problem by physically nailing the wide setting to what it deduces it should be for the whole of Domain Validation. Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman