commit df912ea4ae7233d1504fbd861ee127bd7ee5781d Author: Jeremy Fitzhardinge Date: Tue Sep 25 11:50:00 2007 -0700 xen: execve's error paths don't pin the mm before unpinning execve's error paths don't activate (and therefore pin) the mm before calling exit_mmap to free it up, so don't try to unpin unless it is actually pinned. This prevents a BUG_ON from triggering. Signed-off-by: Jeremy Fitzhardinge Cc: Christian Ostheimer Signed-off-by: Linus Torvalds commit e66485d747505e9d960b864fc6c37f8b2afafaf0 Author: Thomas Gleixner Date: Tue Sep 25 21:37:01 2007 +0200 x86-64: Disable local APIC timer use on AMD systems with C1E commit 3556ddfa9284a86a59a9b78fe5894430f6ab4eef titled [PATCH] x86-64: Disable local APIC timer use on AMD systems with C1E solves a problem with AMD dual core laptops e.g. HP nx6325 (Turion 64 X2) with C1E enabled: When both cores go into idle at the same time, then the system switches into C1E state, which is basically the same as C3. This stops the local apic timer. This was debugged right after the dyntick merge on i386 and despite the patch title it fixes only the 32 bit path. x86_64 is still missing this fix. It seems that mainline is not really affected by this issue, as the PIT is running and keeps jiffies incrementing, but that's just waiting for trouble. -mm suffers from this problem due to the x86_64 high resolution timer patches. This is a quick and dirty port of the i386 code to x86_64. I spent quite a time with Rafael to debug the -mm / hrt wreckage until someone pointed us to this. I really had forgotten that we debugged this half a year ago already. Sigh, is it just me or is there something yelling arch/x86 into my ear? Signed-off-by: Thomas Gleixner Tested-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit 3dffec45c2742961dd27f55aba426cb9cf3f0dcd Author: S.Çağlar Onur Date: Wed Sep 26 12:15:33 2007 +0300 Silent drivers/char/hpet.c build warnings on i386 Following patch silents; ... drivers/char/hpet.c:72: warning: 'clocksource_hpet' defined but not used drivers/char/hpet.c:81: warning: 'hpet_clocksource' defined but not used ... build warnings on i386, they appeared after commit 3b2b64fd311c92f2137eb7cee7025794cd854057 Signed-off-by: S.Çağlar Onur Signed-off-by: Linus Torvalds -- drivers/char/hpet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 255129d1e9ca0ed3d69d5517fae3e03d7ab4b806 Author: Trond Myklebust Date: Tue Sep 25 15:55:03 2007 -0400 NLM: Fix a circular lock dependency in lockd 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 commit f6a592e8abd2f2394623ce5427cbb4c265495974 Author: Chris Malley Date: Wed Sep 26 14:19:18 2007 +1000 lguest example launcher truncates block device file to 0 length on problems The function should also use ftruncate64() rather than ftruncate() to prevent files over 4GB (not uncommon for a root filesystem) being zeroed. Signed-off-by: Chris Malley Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit 78bd8fbbcd66fc977baa40e7fd838a4461b0f727 Author: Al Viro Date: Wed Sep 26 01:54:32 2007 +0100 fix sctp_del_bind_addr() last argument type It gets pointer to fastcall function, expects a pointer to normal one and calls the sucker. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 459685c75b82a0431da102365d507fdb72858b84 Author: Al Viro Date: Wed Sep 26 01:54:12 2007 +0100 hibernation doesn't even build on frv - tons of helpers are missing Signed-off-by: Al Viro Acked-By: David Howells Signed-off-by: Linus Torvalds commit d8c4a2f9d9e7827362fd7ab0b5d9637c6af5ac5b Author: Al Viro Date: Wed Sep 26 01:53:52 2007 +0100 mv643xx_eth: duplicate methods in initializer Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ed4d6375a1498009a9e68d93661207351d36874f Author: Al Viro Date: Wed Sep 26 01:53:42 2007 +0100 usbvision-video: buggered method tables duplicated .mmap in one, .vidioc_s_audio misspelled as .vidioc_g_audio in other Signed-off-by: Al Viro Acked-by: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds commit 5309809129ca3ab14f8bd5e5ef66c1b7686eb639 Author: Linus Torvalds Date: Wed Sep 26 09:16:21 2007 -0700 Add explicit zeroing to "envp" array in device 'show' method As Stephen Hemminger says, this is a "belt and suspenders" patch that zeroes the envp array at allocation time, even though all the users should NULL-terminate it anyway (and we've hopefully fixed everybody that doesn't do that). And we'll apparently clean the whole envp thing up for 2.6.24 anyway. But let's just be robust, and do both this *and* make sure that all users are doing the right thing. Acked-by: Stephen Hemminger Acked-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 544002ef832730b18327000c898a140bfc93efd4 Merge: aa9d40d... ff4abd6... Author: Linus Torvalds Date: Wed Sep 26 09:08:04 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] esp: fix instance numbering. commit aa9d40de77f8ec734f48d0be0c7fe7732d505af4 Merge: d85f579... 603c461... Author: Linus Torvalds Date: Wed Sep 26 09:00:04 2007 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again commit d85f57938ad1d674dff8077a2e6a36a45dbe0e22 Merge: acbbe6c... 45dfd5b... Author: Linus Torvalds Date: Wed Sep 26 08:59:41 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [PPP_MPPE]: Don't put InterimKey on the stack SCTP : Add paramters validity check for ASCONF chunk SCTP: Discard OOTB packetes with bundled INIT early. SCTP: Clean up OOTB handling and fix infinite loop processing SCTP: Explicitely discard OOTB chunks SCTP: Send ABORT chunk with correct tag in response to INIT ACK SCTP: Validate buffer room when processing sequential chunks [PATCH] mac80211: fix initialisation when built-in [PATCH] net/mac80211/wme.c: fix sparse warning [PATCH] cfg80211: fix initialisation if built-in [PATCH] net/wireless/sysfs.c: Shut up build warning commit acbbe6c28a914db837ad8b75773b0a8f873a718a Merge: 9a22e33... 744551c... Author: Linus Torvalds Date: Wed Sep 26 08:58:45 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SUNSAB]: Fix broken SYSRQ. commit 9a22e330e9cbab8deab2db913a0d37bb99140ecb Merge: 4d3fac0... ae3ba4f... Author: Linus Torvalds Date: Wed Sep 26 08:58:13 2007 -0700 Merge branch 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block * 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block: cdrom_open() forgets to unlock on -EROFS failure exits commit 4d3fac08718b49fc256bdb447a479d089ca97b78 Merge: 1f23f42... edeb614... Author: Linus Torvalds Date: Wed Sep 26 08:57:27 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode() sata_sil24: fix IRQ clearing race when PCIX_IRQ_WOC is used commit 1f23f4209f2b99fdddf09821eead6364a6dd9654 Merge: e4b42be... 78e1ca4... Author: Linus Torvalds Date: Wed Sep 26 08:56:28 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: hpet: ACPI Error (utglobal-0126): Unknown exception code: 0xFFFFFFF0 ACPI: CONFIG_ACPI_SLEEP=n power off regression in 2.6.23-rc8 (NOT in rc7) ACPI: suspend: build-fix for CONFIG_SUSPEND=n and CONFIG_HIBERNATION=y commit e4b42be77ecc663550b515fcb7761b01fac0f272 Merge: 4aee491... 2aee619... Author: Linus Torvalds Date: Wed Sep 26 08:55:54 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] WE : Add missing auth compat-ioctl [PATCH] softmac: Fix inability to associate with WEP networks commit 603c461250b223ac42c10b8d1df653af1a361d44 Author: Jeremy Kerr Date: Wed Sep 26 10:53:45 2007 +1000 [POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again The commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10 seems to have been affected by a mismerge of a duplicate patch (d054b36ffd302ec65aabec16a0c60ddd9e6b5a62) - both the spufs_dir_contents and spufs_dir_nosched_contents have been given write-only signal notification files. This change reverts the spufs_dir_contents array to use the readable signal notification file implementation. Signed-off-by: Jeremy Kerr Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ae3ba4fd966e38d8d766d19f7a58b551df8ecc97 Author: Al Viro Date: Wed Sep 26 08:20:44 2007 +0200 cdrom_open() forgets to unlock on -EROFS failure exits Signed-off-by: Al Viro Signed-off-by: Jens Axboe commit 45dfd5b5dd20f17fe23dafc5cfe921474d27f849 Author: Michal Schmidt Date: Tue Sep 25 23:05:39 2007 -0700 [PPP_MPPE]: Don't put InterimKey on the stack Signed-off-by: Michal Schmidt Signed-off-by: David S. Miller commit 6f4c618ddb0e6b7e6d49cfc8134e694be1c0bc9b Author: Wei Yongjun Date: Wed Sep 19 17:19:52 2007 +0800 SCTP : Add paramters validity check for ASCONF chunk If ADDIP is enabled, when an ASCONF chunk is received with ASCONF paramter length set to zero, this will cause infinite loop. By the way, if an malformed ASCONF chunk is received, will cause processing to access memory without verifying. This is because of not check the validity of parameters in ASCONF chunk. This patch fixed this. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit 3c77f961b55b6060858c68a213d7f4470d7f3eb2 Author: Vlad Yasevich Date: Mon Sep 17 15:14:28 2007 -0400 SCTP: Discard OOTB packetes with bundled INIT early. RFC 4460 and future RFC 4960 (2960-bis) specify that packets with bundled INIT chunks need to be dropped. We currenlty do that only after processing any leading chunks. For OOTB chunks, since we already walk the entire packet, we should discard packets with bundled INITs. There are other chunks chunks that MUST NOT be bundled, but the spec is silent on theire treatment. Thus, we'll leave their teatment alone for the moment. Signed-off-by: Vlad Yasevich Acked-by: Wei Yongjun commit ece25dfa0991f65c4e1d26beb1c3c45bda4239b8 Author: Vlad Yasevich Date: Fri Sep 7 16:30:54 2007 -0400 SCTP: Clean up OOTB handling and fix infinite loop processing While processing OOTB chunks as well as chunks with an invalid length of 0, it was possible to SCTP to get wedged inside an infinite loop because we didn't catch the condition correctly, or didn't mark the packet for discard correctly. This work is based on original findings and work by Wei Yongjun Signed-off-by: Vlad Yasevich commit d3f259687fd248aa4de477149481478c122ba48b Author: Vlad Yasevich Date: Fri Sep 7 11:47:45 2007 -0400 SCTP: Explicitely discard OOTB chunks Explicitely discard OOTB chunks, whether the result is a SHUTDOWN COMPLETE or an ABORT. We need to discard the OOTB SHUTDOWN ACK to prevent bombing attackes since responsed MUST NOT be bundled. We also explicietely discard in the ABORT case since that function is widely used internally. Signed-off-by: Vlad Yasevich Acked-by: Neil Horman commit 02c4e12c6400b6dccdc6b5c2c18325551e4b2dc9 Author: Wei Yongjun Date: Fri Aug 31 10:03:58 2007 +0800 SCTP: Send ABORT chunk with correct tag in response to INIT ACK When SCTP client received an INIT ACK chunk with missing mandatory parameter such as "cookie parameter", it will send back a ABORT with T-bit not set and verification tag is set to 0. This is because before we accept this INIT ACK chunk, we do not know the peer's tag. This patch change to reflect vtag when responding to INIT ACK with missing mandatory parameter. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit a09c83847b664dcd67a72613374061c900afb799 Author: Vlad Yasevich Date: Wed Sep 5 15:53:58 2007 -0400 SCTP: Validate buffer room when processing sequential chunks When we process bundled chunks, we need to make sure that the skb has the buffer for each header since we assume it's always there. Some malicious node can send us something like DATA + 2 bytes and we'll try to walk off the end refrencing potentially uninitialized memory. Signed-off-by: Vlad Yasevich commit ca9938fea576ebbb8d8c4fbe8a5bcc937e49e1ca Author: Johannes Berg Date: Tue Sep 11 12:50:32 2007 +0200 [PATCH] mac80211: fix initialisation when built-in When mac80211 is built into the kernel it needs to init earlier so that device registrations are run after it has initialised. The same applies to rate control algorithms. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 136e83d6b8999f4ef680ff9cf2a67e1e1ccbd94e Author: Johannes Berg Date: Mon Sep 10 13:55:08 2007 +0200 [PATCH] net/mac80211/wme.c: fix sparse warning wme.c triggers a sparse warning; it wasn't noticed before because until recently ARRAY_SIZE triggered a sparse error. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 3a4624652e68ee897145ac698a85bfd2603367c3 Author: Johannes Berg Date: Mon Sep 10 13:44:45 2007 +0200 [PATCH] cfg80211: fix initialisation if built-in When cfg80211 is built into the kernel it needs to init earlier so that device registrations are run after it has initialised. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7b5ee3a038c869e773092834abaa8174e0d77514 Author: Satyam Sharma Date: Mon Sep 3 01:41:34 2007 +0530 [PATCH] net/wireless/sysfs.c: Shut up build warning net/wireless/sysfs.c:108: warning: ‘wiphy_uevent’ defined but not used when CONFIG_HOTPLUG=n is because the only usage site of this function is #ifdef'ed as such, so let's #ifdef the definition also. Signed-off-by: Satyam Sharma Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 744551cceb73acd62189cb4afe0a336b2c9684d8 Author: Thomas Bogendoerfer Date: Tue Sep 25 22:49:37 2007 -0700 [SUNSAB]: Fix broken SYSRQ. Include SYSRQ support for SUNSAB if SUNSAB_CONSOLE is selected Signed-off-by: Thomas Bogendoerfer Signed-off-by: David S. Miller commit ff4abd6cfacf0bb23a077f615d3a5cd17359db1b Author: David Miller Date: Fri Aug 24 22:25:58 2007 -0700 [SCSI] esp: fix instance numbering. Because the ->unique_id is set too late, the ESP scsi host instance numbers in the kernel log during probing are wrong. Bug reported by Meelis Roos. Signed-off-by: David S. Miller Signed-off-by: James Bottomley commit edeb614c1c8388b354d93ff7790317cc5d6a38ec Author: Tejun Heo Date: Fri Sep 21 16:29:05 2007 +0900 pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode() sis_66_set_dmamode() also handles early UDMA100 (SIS630 ET) but is missing udma timing value for UDMA100. According to sis5513, this should be 0x8000. This caused UDMA100 device to fail on pata_sis till it downgrades to UDMA66 while it works fine on sis5513 at UDMA100. Reported by Adam Blech. Signed-off-by: Tejun Heo Cc: Adam Blech Signed-off-by: Jeff Garzik commit 228f47b959a0cf2e24c9696757c7e6510334e499 Author: Tejun Heo Date: Sun Sep 23 12:37:05 2007 +0900 sata_sil24: fix IRQ clearing race when PCIX_IRQ_WOC is used When PCIX_IRQ_WOC is used, sil24 has an inherent race condition between clearing IRQ pending and reading IRQ status. If IRQ pending is cleared after reading IRQ status, there's possibility of lost IRQ. If IRQ pending is cleared before reading IRQ status, spurious IRQs will occur. sata_sil24 till now cleared IRQ pending after reading IRQ status thus losing IRQs on machines where PCIX_IRQ_WOC was used. Reverse the order and ignore spurious IRQs if PCIX_IRQ_WOC. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 78e1ca49c7ead5cd00882ed0c776260857613122 Author: Zhao Yakui Date: Thu Sep 20 21:23:13 2007 -0400 ACPI: hpet: ACPI Error (utglobal-0126): Unknown exception code: 0xFFFFFFF0 If hpet has been initialized before registering hpet driver, the callback function of hpet_resources will return the status code of -EBUSY, which is not defined in the ACPI exception table. So when ACPI checks the status code of callback function, it will report the unknown exception code. So the status code in ACPI is used instead of the generic error code in the ACPI callback function of hpet_resources. For example: -EBUSY is replaced by AE_ALREADY_EXISTS -EINVAL is replaced by AE_NO_MEMORY http://bugzilla.kernel.org/show_bug.cgi?id=8630 Signed-off-by: Zhao Yakui Signed-off-by: Len Brown commit 853298bc03ef65e3eb392f5d61265605214ee8fb Author: Alexey Starikovskiy Date: Tue Sep 25 18:45:15 2007 +0400 ACPI: CONFIG_ACPI_SLEEP=n power off regression in 2.6.23-rc8 (NOT in rc7) Signed-off-by: Alexey Starikovskiy Acked-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 2f3f22269bdf702311342c5d106dfdd7347d1c3e Author: Alexey Starikovskiy Date: Mon Sep 24 14:33:21 2007 +0200 ACPI: suspend: build-fix for CONFIG_SUSPEND=n and CONFIG_HIBERNATION=y This fixes compilation with CONFIG_SUSPEND unset and CONFIG_HIBERNATION set (raf. http://marc.info/?l=linux-acpi&m=119055289723895&w=4). Signed-off-by: Alexey Starikovskiy Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 2aee6198652b32e5eaef29a8f8330a9dd15b8efd Merge: 402c79f... d59952d... Author: Jeff Garzik Date: Tue Sep 25 15:47:12 2007 -0400 Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 4aee491cd4e4f1069bfbab309cbd653313938d80 Merge: 973ed7c... 2302827... Author: Linus Torvalds Date: Tue Sep 25 11:19:03 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] scsi_transport_spi: fix domain validation failure from incorrect width setting commit 973ed7c49a5c2271a10ce54ac06bba5617fca3a8 Merge: a7f3941... cb56073... Author: Linus Torvalds Date: Tue Sep 25 11:18:10 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: appletouch - fix idle reset logic commit a7f3941a2cecf044f3c2975aee9c2bd423018463 Merge: f3fe81d... 474f819... Author: Linus Torvalds Date: Tue Sep 25 08:54:35 2007 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Ensure FULL_REGS on exec commit f3fe81d9c953adc627e26fdd4a9fbfe22cf67ef2 Merge: bbbd2bf... 402c79f... Author: Linus Torvalds Date: Tue Sep 25 08:52:26 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: Revert "drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo" sky2: be more selective about FIFO watchdog sky2: FE+ Phy initialization r8169: workaround against ignored TxPoll writes (8168) r8169: correct phy parameters for the 8110SC commit bbbd2bf00bab467cff7b1f418b2cb24c71291f59 Author: Rusty Russell Date: Mon Sep 24 21:24:44 2007 -0700 fix modules oopsing in lguest guests The assembly templates for lguest guest patching are in the .init.text section. This means that modules get patched with "cc cc cc cc" or similar junk. Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdfb870f8e34e77567043b388051df14f7d33482 Author: Danny ter Haar Date: Mon Sep 24 21:24:43 2007 -0700 typo fix Kernel config option Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1cf16c91605d051d36360f70858b06b103b4aed Author: Stephen Hemminger Date: Mon Sep 24 21:24:42 2007 -0700 missing null termination in one wire uevent Need to null terminate environment. Found by inspection while looking for similar problems to platform uevent bug Signed-off-by: Stephen Hemminger Cc: Greg Kroah-Hartman Acked-by: Evgeniy Polyakov Cc: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afa684f6fda6086b229348f0ea21df7c8ad17964 Author: Cliff Wickman Date: Mon Sep 24 21:24:41 2007 -0700 fix "mspec: handle shrinking virtual memory areas" The vma_data structure may be shared by vma's from multiple tasks, with no way of knowing which areas are shared or not shared, so release/clear pages only when the refcount (of vma's) goes to zero. Signed-off-by: Cliff Wickman Cc: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9b7cba1b8a74c10b0771ca28d4c554aeb9803fc Author: Evgeniy Dushistov Date: Mon Sep 24 21:24:39 2007 -0700 ufs: fix sun state Different types of ufs hold state in different places, to hide complexity of this, there is ufs_get_fs_state, it returns state according to "UFS_SB(sb)->s_flags", but during mount ufs_get_fs_state is called, before setting s_flags, this cause message for ufs types like sun ufs: "fs need fsck", and remount in readonly state. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 474f81967217f3bec2389ae913da72641f2c40e3 Author: Roland McGrath Date: Mon Sep 24 16:52:44 2007 -0700 [POWERPC] Ensure FULL_REGS on exec When PTRACE_O_TRACEEXEC is used, a ptrace call to fetch the registers at the PTRACE_EVENT_EXEC stop (PTRACE_PEEKUSR) will oops in CHECK_FULL_REGS. With recent versions, "gdb --args /bin/sh -c 'exec /bin/true'" and "run" at the (gdb) prompt is sufficient to produce this. I also have written an isolated test case, see https://bugzilla.redhat.com/show_bug.cgi?id=301791#c15. This change fixes the problem by clearing the low bit of pt_regs.trap in start_thread so that FULL_REGS is true again. This is correct since all of the GPRs that "full" refers to are cleared in start_thread. Signed-off-by: Roland McGrath Signed-off-by: Paul Mackerras commit 402c79fb1944c8e003a32d07f31504b769fe2b52 Merge: 21c0f27... d78ae2d... Author: Jeff Garzik Date: Tue Sep 25 00:14:03 2007 -0400 Merge branch 'r8169-for-jeff-20070919' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp commit 21c0f275085e5b884a409d75a7deb73ece6477fb Author: Jeff Garzik Date: Tue Sep 25 00:11:34 2007 -0400 Revert "drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo" This reverts commit fadacb1b80e35e0b36a90d43e21ef91eec4b889b. The change being reverted made the driver consistent with include/linux/netdevice.h, but then inconsistent with the other PCMCIA ethernet drivers. Signed-off-by: Jeff Garzik commit cb560737676260ac15b68d426305ad5e755417ea Author: Thomas Rohwer Date: Tue Sep 25 00:06:25 2007 -0400 Input: appletouch - fix idle reset logic Idle count should only be incremented when touchpad button is not pressed, otherwise reset may happen at a wrong time and touchpad will never report button release event. Signed-off-by: Thomas Rohwer Acked-by: Matthew Garrett Signed-off-by: Dmitry Torokhov commit e0c281163d634e2982a81b55fc974a6663afde65 Author: Stephen Hemminger Date: Thu Sep 20 13:03:49 2007 -0700 sky2: be more selective about FIFO watchdog Be more selective about when to enable the ram buffer watchdog code. It is unnecessary on XL A3 or later revs, and with Yukon FE the buffer is so small (4K) that the watchdog detects false positives. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 6d3105d5388c359882068b161b431ab3db4b3721 Author: Stephen Hemminger Date: Mon Sep 24 19:34:51 2007 -0700 sky2: FE+ Phy initialization One more snippet of PHY initialization required for FE+ chips. Discovered in latest sk98lin 10.21.1.3 driver. Please apply to 2.6.23. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 2302827c95fe0f441025acd5133e532d2eef322b Author: James Bottomley Date: Sat Sep 22 08:40:09 2007 -0500 [SCSI] scsi_transport_spi: fix domain validation failure from incorrect width setting 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 commit d59952d532ed8fc93ccb98186f73d9ce5cfcb93d Author: Jean Tourrilhes Date: Thu Sep 20 11:08:18 2007 -0700 [PATCH] WE : Add missing auth compat-ioctl Johannes just found that we are missing a compat-ioctl declaration. The fix is trivial. As previous patches for compat-ioctl, this should also go to stable. More info : http://marc.info/?l=linux-wireless&m=119029667902588&w=2 Signed-off-by: Jean Tourrilhes Signed-off-by: John W. Linville commit efe870f9f4ad74410a18ecbf0d9ba7c14b50a0fb Author: Larry Finger Date: Tue Sep 18 22:00:52 2007 -0500 [PATCH] softmac: Fix inability to associate with WEP networks Commit 4cf92a3c was submitted as a fix for bug #8686 at bugzilla.kernel.org (http://bugzilla.kernel.org/show_bug.cgi?id=8686). Unfortunately, the fix led to a new bug, reported by Yoshifuji Hideaki, that prevented association for WEP encrypted networks that use ifconfig to control the device. This patch effectively reverts the earlier commit and does a proper fix for bug #8686. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit d78ae2dcc2acebb9a1048278f47f762c069db75c Author: Francois Romieu Date: Sun Aug 26 20:08:19 2007 +0200 r8169: workaround against ignored TxPoll writes (8168) The 8168 ignores the requests to fetch the Tx descriptors when the relevant TxPoll bit is already set. It easily kills the performances of the 8168. David Gundersen has noticed that it is enough to wait for the completion of the DMA transfer (NPQ bit is cleared) before writing the TxPoll register again. The extra IO traffic added by the proposed workaround could be minimalized but it is not a high-priority task. Fix for: http://bugzilla.kernel.org/show_bug.cgi?id=7924 http://bugzilla.kernel.org/show_bug.cgi?id=8688 (http://bugzilla.kernel.org/show_bug.cgi?id=7555 ?) Signed-off-by: Francois Romieu Cc: David Gundersen Cc: Edward Hsu commit 65d916d95314566f426cc40ff0f17b754a773b0b Author: Edward Hsu Date: Fri Aug 17 10:14:36 2007 +0200 r8169: correct phy parameters for the 8110SC The phys of the 8110SC (RTL_GIGA_MAC_VER_{05/06}) act abnormally in gigabit mode if they are applied the parameters in rtl8169_hw_phy_config which actually aim the 8110S/SB. It is ok to return early from rtl8169_hw_phy_config as it does not apply to the 8101 and 8168 families. Signed-off-by: Edward Hsu Signed-off-by: Francois Romieu