commit 907a42617970a159361f17ef9a63f04d276995ab Author: Linus Torvalds Date: Mon Oct 10 18:19:19 2005 -0700 Linux v2.6.14-rc4 commit 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 Author: Andi Kleen Date: Tue Oct 11 01:28:33 2005 +0200 [PATCH] i386: Don't discard upper 32bits of HWCR on K8 Need to use long long, not long when RMWing a MSR. I think it's harmless right now, but still should be better fixed if AMD adds any bits in the upper 32bit of HWCR. Bug was introduced with the TLB flush filter fix for i386 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 421c7ce6d001fce28b1fa8fdd2e7ded0ed8a0ad5 Author: Andi Kleen Date: Mon Oct 10 22:32:45 2005 +0200 [PATCH] x86_64: Allocate cpu local data for all possible CPUs CPU hotplug fills up the possible map to NR_CPUs, but it did that after setting up per CPU data. This lead to CPU data not getting allocated for all possible CPUs, which lead to various side effects. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d7dd8a72ab8d305fbe1c4bb571e0633eba3a8d23 Author: Linus Torvalds Date: Mon Oct 10 16:31:30 2005 -0700 Use the new "kill_proc_info_as_uid()" for USB disconnect too All the same issues - we can't just save the pointer to the thread, we must save the pid/uid/euid combination. Signed-off-by: Linus Torvalds commit 46113830a18847cff8da73005e57bc49c2f95a56 Author: Harald Welte Date: Mon Oct 10 19:44:29 2005 +0200 [PATCH] Fix signal sending in usbdevio on async URB completion If a process issues an URB from userspace and (starts to) terminate before the URB comes back, we run into the issue described above. This is because the urb saves a pointer to "current" when it is posted to the device, but there's no guarantee that this pointer is still valid afterwards. In fact, there are three separate issues: 1) the pointer to "current" can become invalid, since the task could be completely gone when the URB completion comes back from the device. 2) Even if the saved task pointer is still pointing to a valid task_struct, task_struct->sighand could have gone meanwhile. 3) Even if the process is perfectly fine, permissions may have changed, and we can no longer send it a signal. So what we do instead, is to save the PID and uid's of the process, and introduce a new kill_proc_info_as_uid() function. Signed-off-by: Harald Welte [ Fixed up types and added symbol exports ] Signed-off-by: Linus Torvalds commit 5d8e1b181c4ad63e6ca90d51287b31afd400d2eb Author: David S. Miller Date: Mon Oct 10 16:12:13 2005 -0700 [SPARC64]: Fix Ultra5, Ultra60, et al. boot failures. On the boot processor, we need to do the move onto the Linux trap table a little bit differently else we'll take unhandlable faults in the firmware address space. Previously we would do the following: 1) Disable PSTATE_IE in %pstate. 2) Set %tba by hand to sparc64_ttable_tl0 3) Initialize alternate, mmu, and interrupt global trap registers. 4) Call prom_set_traptable() That doesn't work very well actually with the way we boot the kernel VM these days. It worked by luck on many systems because the firmware accesses for the prom_set_traptable() call happened to be loaded into the TLB already, something we cannot assume. So the new scheme is this: 1) Clear PSTATE_IE in %pstate and set %pil to 15 2) Call prom_set_traptable() 3) Initialize alternate, mmu, and interrupt global trap registers. and this works quite well. This sequence has been moved into a callable function in assembler named setup-trap_table(). The idea is that eventually trampoline.S can use this code as well. That isn't possible currently due to some complications, but eventually we should be able to do it. Thanks to Meelis Roos for the Ultra5 boot failure report. Signed-off-by: David S. Miller commit 094804c5a132f04c12dd4902ee15c64362e5c1af Author: Andi Kleen Date: Tue Oct 11 01:03:39 2005 +0200 [PATCH] x86_64: Fix change_page_attr cache flushing Noticed by Terence Ripperda Undo wrong change in global_flush_tlb. We need to flush the caches in all cases, not just when pages were reverted. This was a bogus optimization added earlier, but it was wrong. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 71e2b2ecc1c44cb4f2f3e68827af8b90246becac Author: Vincent Sanders Date: Mon Oct 10 18:24:09 2005 +0100 [ARM] 2968/1: defconfig for the ARM Collie platform Patch from Vincent Sanders Add a defconfig for the ARM Collie platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 36e5ea67590707a069ce3bcc179b38cdabebcfdd Author: Vincent Sanders Date: Mon Oct 10 18:24:08 2005 +0100 [ARM] 2967/1: defconfig for the ARM Corgi platform Patch from Vincent Sanders Add a defconfig for the ARM Corgi Zarus platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit b0bdc7be78931dfbfaec8bd0da44a5f4e158ca8f Author: Vincent Sanders Date: Mon Oct 10 18:24:07 2005 +0100 [ARM] 2966/1: defconfig for the ARM Poodle platform Patch from Vincent Sanders Add a defconfig for the ARM Poodle Zarus platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 86b324874f571297237c0c940bfe7e5f0f9ca5d2 Author: Vincent Sanders Date: Mon Oct 10 18:24:06 2005 +0100 [ARM] 2965/1: defconfig for the ARM Spitz platform Patch from Vincent Sanders Add a defconfig for the ARM Spitz Zarus platform Signed-off-by: Richard Purdie Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 585f54575d832506bbe9b5a2f435f37b81efc849 Author: Nicolas Pitre Date: Mon Oct 10 18:22:17 2005 +0100 [ARM] 2956/1: fix the "Fix gcc4 build errors in ucb1x00-core.c" Patch from Nicolas Pitre drivers/mfd/ucb1x00-core.c: In function 'ucb1x00_probe': drivers/mfd/ucb1x00-core.c:482: error: 'ucb1x00_class' undeclared (first use in this function) Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit d347f372273c2b3d86a66e2e1c94c790c208e166 Author: Markus F.X.J. Oberhumer Date: Sun Oct 9 18:54:23 2005 +0200 [PATCH] i386: fix stack alignment for signal handlers This fixes the setup of the alignment of the signal frame, so that all signal handlers are run with a properly aligned stack frame. The current code "over-aligns" the stack pointer so that the stack frame is effectively always mis-aligned by 4 bytes. But what we really want is that on function entry ((sp + 4) & 15) == 0, which matches what would happen if the stack were aligned before a "call" instruction. Signed-off-by: Markus F.X.J. Oberhumer Signed-off-by: Linus Torvalds commit 867f8b4e47a17c5d68c98dc6eee12739c4490056 Author: Benjamin Herrenschmidt Date: Sun Oct 9 10:37:47 2005 +1000 [PATCH] ide: Workaround PM problem The logic in ide_do_request() doesn't guarantee that both drives will be serviced after a call. It may "forget" to service one in some circumstances, including when one of the drive is suspended (it will eventually fail to service the slave when the master is suspended for example). This prevents the wakeup requests that gets queued on wakeup from sleep from beeing serviced in some cases when 2 drives are sharing an IDE bus. The problem is deep enough in the way this code works (and there are probably a few other problematic but rare corner cases) and fixing it would require some major rethinking of the way IDE decides which channel to service. This is not 2.6.14 material. However, in the meantime, Bart has accepted this simple workaround that will fix the crash on wakeup from sleep since this specific corner case is actually hitting users to get into 2.6.14. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 1cc956e12aedfdc6baf6312bc36a6b5a71af3c9d Author: Tom Zanussi Date: Sun Oct 9 10:41:32 2005 -0500 [PATCH] relayfs: fix bogus param value in call to vmap The third param in this call to vmap shouldn't be GFP_KERNEL, which makes no sense, but rather VM_MAP. Thanks to Al Viro for spotting this. Signed-off-by: Tom Zanussi Signed-off-by: Linus Torvalds commit 50f72b57946d565db74fae71bac23f3f319311c8 Author: Jeff Dike Date: Sun Oct 9 16:11:44 2005 -0400 [PATCH] uml: fix x86_64 with !CONFIG_FRAME_POINTER UML/x86_64 doesn't run when built with frame pointers disabled. There was an implicit frame pointer assumption in the stub segfault handler. With frame pointers disabled, UML dies on handling its first page fault. The container-of part of this is from Paolo Giarrusso . Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit 3dd083255ddcfa87751fa8e32f61a9547a15a541 Author: Rafael J. Wysocki Date: Sun Oct 9 21:19:40 2005 +0200 [PATCH] x86_64: Set up safe page tables during resume The following patch makes swsusp avoid the possible temporary corruption of page translation tables during resume on x86-64. This is achieved by creating a copy of the relevant page tables that will not be modified by swsusp and can be safely used by it on resume. The problem is that during resume on x86-64 swsusp may temporarily corrupt the page tables used for the direct mapping of RAM. If that happens, a page fault occurs and cannot be handled properly, which leads to the solid hang of the affected system. This leads to the loss of the system's state from before suspend and may result in the loss of data or the corruption of filesystems, so it is a serious issue. Also, it appears to happen quite often (for me, as often as 50% of the time). The problem is related to the fact that (at least) one of the PMD entries used in the direct memory mapping (starting at PAGE_OFFSET) points to a page table the physical address of which is much greater than the physical address of the PMD entry itself. Moreover, unfortunately, the physical address of the page table before suspend (i.e. the one stored in the suspend image) happens to be different to the physical address of the corresponding page table used during resume (i.e. the one that is valid right before swsusp_arch_resume() in arch/x86_64/kernel/suspend_asm.S is executed). Thus while the image is restored, the "offending" PMD entry gets overwritten, so it does not point to the right physical address any more (i.e. there's no page table at the address pointed to by it, because it points to the address the page table has been at during suspend). Consequently, if the PMD entry is used later on, and it _is_ used in the process of copying the image pages, a page fault occurs, but it cannot be handled in the normal way and the system hangs. In principle we can call create_resume_mapping() from swsusp_arch_resume() (ie. from suspend_asm.S), but then the memory allocations in create_resume_mapping(), resume_pud_mapping(), and resume_pmd_mapping() must be made carefully so that we use _only_ NosaveFree pages in them (the other pages are overwritten by the loop in swsusp_arch_resume()). Additionally, we are in atomic context at that time, so we cannot use GFP_KERNEL. Moreover, if one of the allocations fails, we should free all of the allocated pages, so we need to trace them somehow. All of this is done in the appended patch, except that the functions populating the page tables are located in arch/x86_64/kernel/suspend.c rather than in init.c. It may be done in a more elegan way in the future, with the help of some swsusp patches that are in the works now. [AK: move some externs into headers, renamed a function] Signed-off-by: Rafael J. Wysocki Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 52a2d3e45e06012a662f627177729d3196ba8903 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:53 2005 +0200 [PATCH] uml: cleanup whitespace for COW driver Fix whitespace - I split this off the previous patch for easier review. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 028c0cc16e429ae24d9b8aacc64f4438bdfac0cc Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:45 2005 +0200 [PATCH] uml: cleanup byte order macros for COW driver After restoring the existing code, make it work also when included in kernelspace code (which isn't currently the case, but at least this will prevent people from "fixing" it as just happened). Whitespace is fixed in next patch - it cluttered the diff too much. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 855ec613ca7e1953d96d7ea81af90392678788f5 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:35 2005 +0200 [PATCH] uml: restore include breakage, breaking binary format of COW driver Commit 44456d37b59d8e541936ed26d8b6e08d27e88ac1, between 2.6.13-rc3 and -rc4, was a "nice cleanup" which broke something. Revert the offending part. It broke because: a) because this part doesn't fall under the description b) the author didn't know what he was doing here c) the author didn't try to compile the existing code and see that it worked perfectly. d) the author didn't ask us what was happening e) you didn't either, and somebody there should have learned that UML is a bit different. In fact, UML is special in linking to host libc and using its includes. In particular, since host includes always define both __BIG_ENDIAN and __LITTLE_ENDIAN, ntohll() macros started thinking to be in a big-endian world; and on-disk compatibility was broken. Many thanks go to Nix for reporting the problem and correctly diagnosing an endianness problem. Btw, this patch restores the previous code, which worked; but the definitions would be uncorrect if used in kernelspace files. Next patch addresses that. Cc: Nix , Olaf Hering Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 54a8a2220c936a47840c9a3d74910c5a56fae2ed Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:26 2005 +0200 [PATCH] uml: allow building .s/.i/.lst files from userspace files For files which need to include glibc headers (i.e. userspace files), we specified the correct flags only for .o, not for .s/.lst/.i. Fix this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 9e3d862e5c341c59b673c9cadd64210ca03cb41e Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:18 2005 +0200 [PATCH] uml: add mode=skas0 as a synonym of skas0 Too many people were confused by skas0 and tried using "mode=skas0". And after all, they are right - accept this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 5cd10daa0c7fc1410e1c0d685cbc9622c769eb16 Author: Paolo 'Blaisorblade' Giarrusso Date: Sun Oct 9 21:37:05 2005 +0200 [PATCH] Uml: hide commands when not being verbose Add a missing $(Q) to a "ln" invocation. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds commit 220ec0291130a932b32b2c66a10e9c5019dab702 Author: Steven Rostedt Date: Mon Oct 10 11:13:17 2005 -0400 [PATCH] pcmcia: fix task state at pccard thread exit The pccardd thread has a race in it that it can shutdown in the TASK_INTERRUPTIBLE state. Make sure we mark ourselves runnable again as we remove ourselves from the wait queue. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 7dead80cbee3259e3a9f25bfc65c8dc769a19e0e Author: Ben Dooks Date: Mon Oct 10 10:20:07 2005 +0100 [ARM] 2964/1: S3C2410 - serial: add .owner to driver Patch from Ben Dooks Initialise the driver's .owner field so that the device driver can be referenced to the module that owns it Signed-off-by: Ben Dooks Signed-off-by: Russell King commit cdfc8f5079fdd18f6cb8097aa4235704d1155ec5 Author: Ben Dooks Date: Mon Oct 10 10:20:06 2005 +0100 [ARM] 2963/1: S3C2410 - add .owner field to device_driver Patch from Ben Dooks Add initialisation of .owner field so that the device driver can be referenced to the module that owns it. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 7c3989885cfd37d237eca97832b712a7ffbbf40c Author: Richard Purdie Date: Mon Oct 10 10:20:06 2005 +0100 [ARM] 2962/1: scoop: Allow GPIO pin suspend state to be specified Patch from Richard Purdie Allow the GPIO pin suspend states to be specified for SCOOP devices. This is needed for correct operation on the spitz platform. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 1036260e93a907a0143efa31bf05be1f3271eb90 Author: Richard Purdie Date: Mon Oct 10 10:17:45 2005 +0100 [ARM] 2961/1: corgi: Add missing include Patch from Richard Purdie Add a missing include from corgi.c Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 97b8e00e8538c9eb23983545d665ffd7052ccedb Author: Richard Purdie Date: Mon Oct 10 10:17:44 2005 +0100 [ARM] 2960/1: collie: Add missing scoop call parameters Patch from Richard Purdie Add some missing parameters from the scoop calls on collie. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 19da83f632d235fff9f94671d2e2cf87d27a2446 Author: George G. Davis Date: Mon Oct 10 10:17:44 2005 +0100 [ARM] 2959/1: Add test for invalid LDRD/STRD Rd cases in ARM alignment handler Patch from George G. Davis Add test for invalid LDRD/STRD Rd cases in ARM alignment handler and restore SWP printk KERN_ERR. Signed-off-by: Steve Longerbeam Signed-off-by: George G. Davis Signed-off-by: Russell King commit 79d13b62ef9da84d3ba551caac42d6107e57208f Author: Sascha Hauer Date: Mon Oct 10 10:17:43 2005 +0100 [ARM] 2958/1: fix definition in imx-regs.h Patch from Sascha Hauer Fix PD7_AF_UART2_DTR definition Signed-off-by: Giancarlo Formicuccia Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 86371d071bc38a181984b01d323b6172a4b7bb1f Author: Sascha Hauer Date: Mon Oct 10 10:17:42 2005 +0100 [ARM] 2957/1: imx UART Error handling Patch from Sascha Hauer Fix error path in imx_startup. Signed-off-by: Giancarlo Formicuccia Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit ce80cc14810fbd78fa70c15c7e16a0b26d462fc6 Author: Russell King Date: Mon Oct 10 09:48:10 2005 +0100 [ARM] Update mach-types Signed-off-by: Russell King commit 2e457ef667158840c1be511f5d10dd42c6dbbe46 Author: Sven Hartge Date: Sat Oct 8 21:12:04 2005 -0700 [SPARC64]: Fix compile error in irq.c irq.c is missing the inclusion of asm/io.h, which causes readb() and writeb() the be undefined. Signed-off-by: Sven Hartge Signed-off-by: David S. Miller commit dd0fc66fb33cd610bc1a5db8a5e232d34879b4d7 Author: Al Viro Date: Fri Oct 7 07:46:04 2005 +0100 [PATCH] gfp flags annotations - part 1 - added typedef unsigned int __nocast gfp_t; - replaced __nocast uses for gfp flags with gfp_t - it gives exactly the same warnings as far as sparse is concerned, doesn't change generated code (from gcc point of view we replaced unsigned int with typedef) and documents what's going on far better. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3b0e77bd144203a507eb191f7117d2c5004ea1de Author: Jens Axboe Date: Fri Oct 7 19:41:34 2005 +0200 [PATCH] scsi_ioctl: only warn for rejected commands We should not be warning about commands that we allow, even if they are unknown. So move the if-root-allow check up a notch. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 7ab501db8cb6659efdf04034e0de6b44c059a51b Author: David Howells Date: Fri Oct 7 16:41:24 2005 +0100 [PATCH] Keys: Possessor permissions should be additive This patch makes the possessor permissions on a key additive with user/group/other permissions on the same key. This permits extra rights to be granted to the possessor of a key without taking away any rights conferred by them owning the key or having common group membership. Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit 468ed2b0c85ec4310b429e60358213b6d077289e Author: David Howells Date: Fri Oct 7 15:07:38 2005 +0100 [PATCH] Keys: Split key permissions checking into a .c file The attached patch splits key permissions checking out of key-ui.h and moves it into a .c file. It's quite large and called quite a lot, and it's about to get bigger with the addition of LSM support for keys... key_any_permission() is also discarded as it's no longer used. Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit f1a9badcf6ecad9975240d94514721cb93932151 Author: David Howells Date: Fri Oct 7 15:04:52 2005 +0100 [PATCH] Keys: Add request-key process documentation The attached patch adds documentation for the process by which request-key works, including how it permits helper processes to gain access to the requestor's keyrings. Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit 74fd92c511bd4a0771ac0faaaef38bb1be3a29f6 Author: David Howells Date: Fri Oct 7 15:01:09 2005 +0100 [PATCH] key: plug request_key_auth memleak Plug request_key_auth memleak. This can be triggered by unprivileged users, so is local DoS. Signed-off-by: Chris Wright Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit c2059b2e0b209a0674c21f78337bb158d3ccb22b Author: David Vrabel Date: Fri Oct 7 14:43:22 2005 +0100 [PATCH] yenta: fix build if YENTA && !CARDBUS (struct pcmcia_socket).tune_bridge only exists if CONFIG_CARDBUS is set but building yenta_socket without CardBus is valid. Signed-off-by: David Vrabel Signed-off-by: Linus Torvalds commit 788e05a67c343fa22f2ae1d3ca264e7f15c25eaf Author: Oleg Nesterov Date: Fri Oct 7 17:46:19 2005 +0400 [PATCH] fix do_coredump() vs SIGSTOP race Let's suppose we have 2 threads in thread group: A - does coredump B - has pending SIGSTOP thread A thread B do_coredump: get_signal_to_deliver: lock(->sighand) ->signal->flags = SIGNAL_GROUP_EXIT unlock(->sighand) lock(->sighand) signr = dequeue_signal() ->signal->flags |= SIGNAL_STOP_DEQUEUED return SIGSTOP; do_signal_stop: unlock(->sighand) coredump_wait: zap_threads: lock(tasklist_lock) send SIGKILL to B // signal_wake_up() does nothing unlock(tasklist_lock) lock(tasklist_lock) lock(->sighand) re-check sig->flags & SIGNAL_STOP_DEQUEUED, yes set_current_state(TASK_STOPPED); finish_stop: schedule(); // ->state == TASK_STOPPED wait_for_completion(&startup_done) // waits for complete() from B, // ->state == TASK_UNINTERRUPTIBLE We can't wake up 'B' in any way: SIGCONT will be ignored because handle_stop_signal() sees ->signal->flags & SIGNAL_GROUP_EXIT. sys_kill(SIGKILL)->__group_complete_signal() will choose uninterruptible 'A', so it can't help. sys_tkill(B, SIGKILL) will be ignored by specific_send_sig_info() because B already has pending SIGKILL. This scenario is not possbile if 'A' does do_group_exit(), because it sets sig->flags = SIGNAL_GROUP_EXIT and delivers SIGKILL to subthreads atomically, holding both tasklist_lock and sighand->lock. That means that do_signal_stop() will notice !SIGNAL_STOP_DEQUEUED after re-locking ->sighand. And it is not possible to any other thread to re-add SIGNAL_STOP_DEQUEUED later, because dequeue_signal() can only return SIGKILL. I think it is better to change do_coredump() to do sigaddset(SIGKILL) and signal_wake_up() under sighand->lock, but this patch is much simpler. Signed-off-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 4f55cd105c38af4aa157804729d694f864fbc78a Author: Jean-Denis Boyer Date: Fri Oct 7 13:44:35 2005 -0700 [ATM]: [br2684] if we free the skb, we should return 0 From: "Jean-Denis Boyer" Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit ba6399334dd8a75bd295de26496196c720abae0a Author: David S. Miller Date: Fri Oct 7 13:30:49 2005 -0700 [SPARC64]: Fix userland FPU state corruption. We need to use stricter memory barriers around the block load and store instructions we use to save and restore the FPU register file. Signed-off-by: David S. Miller commit d85c3553df5e24cb3117385f0a17e1cc0436d148 Author: Tom 'spot' Callaway Date: Fri Oct 7 13:05:56 2005 -0700 [SPARC]: Fix p9100 framebuffer in 2.6 The attached patch fixes the p9100 framebuffer so that text is viewable (not black on black, like it was before the patch). The linux logo displays for a very short period of time, then is replaced by a grey box. This leads me to believe that this framebuffer would have problems in X, but since there hasn't been a weitek driver for X in several millennia, this isn't something that I can confirm or deny. But this patch does get color console working on my SPARCbook 3TX. Signed-off-by: Tom 'spot' Callaway Signed-off-by: David S. Miller commit a25f175c2f6962c38cdbacfc4b66b297f4fb54b2 Author: Clemens Ladisch Date: Wed Oct 5 13:23:19 2005 +0200 [ALSA] usb-audio: add MIDI quirk for Hercules DJ Console USB generic driver Add a quirk entry for the external MIDI ports of the Windows Edition of the Hercules DJ Console. Signed-off-by: Clemens Ladisch commit 9c9565f709f28c12dadfe74b31f2c86ffd75f71e Author: Clemens Ladisch Date: Wed Oct 5 13:02:38 2005 +0200 [ALSA] usb-audio: add another ID for Hercules DJ Console USB generic driver Add a mixer quirk entry for the Hercules DJ Console (Windows Edition) that uses a different USB product ID. Signed-off-by: Clemens Ladisch commit 4d060fd16946d767ee903804c6769a26d7da7ab2 Author: Takashi Iwai Date: Tue Oct 4 13:50:44 2005 +0200 [ALSA] ali5451 - Don't build non-existing modem PCM ALI5451 driver Don't build the modem PCM if the corresponding codec isn't detected. Signed-off-by: Takashi Iwai commit b150869369adafb7cc0cf65ea500f9f3c4bbf857 Author: Takashi Iwai Date: Tue Oct 4 13:49:32 2005 +0200 [ALSA] emu10k1 - Fix handling of ac97_chip=2 EMU10K1/EMU10K2 driver Fixed the handling of ac97_chip=2 capability type. The error occurs in snd_ac97_mixer(), not in snd_ac97_bus(). Also, release the unnecessary ac97_bus object in the error path. Signed-off-by: Takashi Iwai commit 315e3bd717068624ce888f3d045a168acefc6ce8 Author: Clemens Ladisch Date: Tue Oct 4 08:42:10 2005 +0200 [ALSA] korg1212: fix typo KORG1212 driver Add a missing comma that made the stateName array one entry too short. Signed-off-by: Clemens Ladisch commit f12aa40c9d76af5add413731d30565327219c41f Author: Takashi Iwai Date: Fri Sep 30 16:56:59 2005 +0200 [ALSA] emu10k1 - Fix loading of SBLive Game board EMU10K1/EMU10K2 driver Fixed the error at loading SBLive Game board (and possible other models). The PCI SSIDs of this board conflicts with SB Live 5.1 Platinum, which has no AC97 chip. Signed-off-by: Takashi Iwai commit c66186e1c966e7e115a86af55597c05c5512014b Author: Takashi Iwai Date: Thu Sep 29 13:49:44 2005 +0200 [ALSA] via82xx - dxs_support entry for an ASUS mobo VIA82xx driver Addded a dxs_support entry for an ASUS mobo. Signed-off-by: Takashi Iwai commit 35451088f445955fe460a38b25b97c263ff35033 Author: Takashi Iwai Date: Thu Sep 29 13:25:14 2005 +0200 [ALSA] Fix confliction of capture controls on ALC880 test model HDA Codec driver Fixed the confliction of capture controls on ALC880 'test' model. Signed-off-by: Takashi Iwai commit 92447f3f1a1c1af418eb1dfee85a7685d9b9a3ef Author: John W. Linville Date: Thu Sep 29 13:20:45 2005 +0200 [ALSA] fix HD audio ALC882 lfe (un)mute HDA Codec driver Mark the ALC882 'LFE Playback Switch' as an input, like the other playback switch settings. Signed-off-by: John W. Linville Signed-off-by: Takashi Iwai commit 1c1fa8b69e6d538bcc1e58791938b31a2354ee65 Author: John W. Linville Date: Thu Sep 29 13:18:41 2005 +0200 [ALSA] fix alc880_test_mixer typo HDA Codec driver Fix a typo (cut & paste) in the alc880_test_mixer structure. Signed-off-by: John W. Linville Signed-off-by: Takashi Iwai commit a7175aab3f5cffe3c79575e56dfcfe87a41a74c7 Author: John W. Linville Date: Thu Sep 29 13:13:38 2005 +0200 [ALSA] fix HD audio ALC260 mono (un)mute HDA Codec driver The ALC260 'Mono Playback Switch' is marked as an output in patch_realtek.c. It actually does not work unless it is marked as an input. Go figure... This was tested and confirmed on an HP xw4300. Signed-off-by: John W. Linville Signed-off-by: Takashi Iwai commit d31cbbfd80a84696847913b7486a998481038663 Author: Clemens Ladisch Date: Mon Sep 26 09:59:57 2005 +0200 [ALSA] usb-audio: increase max buffer size USB generic driver Increase the maximum PCM buffer size to 1 MB. The USB driver doesn't have any inherent buffer size limit, and big multichannel interfaces may benefit from this. Signed-off-by: Clemens Ladisch commit 31ab9523ed3773d5de7c07b3b6c4c00ddb06045e Author: Clemens Ladisch Date: Mon Sep 26 08:55:01 2005 +0200 [ALSA] usb-audio: add another ID for the TerraTec PHASE26 USB generic driver There is another revision of the PHASE26 with a different product ID; add a quirk entry for that, too. Signed-off-by: Clemens Ladisch commit f542fda8f8cd0cc0e4bffef42b27c7dc59cd07d3 Author: Clemens Ladisch Date: Tue Sep 20 09:06:36 2005 +0200 [ALSA] usb-audio: add more Yamaha USB MIDI devices USB generic driver Add quirk entries for four unknown Yamaha USB MIDI devices. Signed-off-by: Clemens Ladisch commit 1e8bdcaf82268ac713cbbaffc14801147be42ae7 Author: Takashi Iwai Date: Mon Sep 19 15:21:17 2005 +0200 [ALSA] Add iBook 1.33GHz support PPC PMAC driver Added the support of iBook 1.33GHz. Signed-off-by: Takashi Iwai commit 5a2a68f5a1dab785d60a4575f48af5b15ab6328d Author: Clemens Ladisch Date: Mon Sep 19 12:24:00 2005 +0200 [ALSA] usb-audio: add Roland RD-700SX support USB generic driver Add a quirk entry for the Roland RD-700SX. This should work for the RD-300SX, too. Signed-off-by: Clemens Ladisch commit db99055f8d8eb54d9da55293a11b82e9d53ca80d Author: Takashi Iwai Date: Fri Sep 16 19:07:52 2005 +0200 [ALSA] via82xx - Add a dxs whitelist entry VIA82xx driver Added a dxs whitelist entry for an ECS mobo. Signed-off-by: Takashi Iwai commit 90b66e833261618e11d71a35f2488a7d664a4566 Author: Nicolas Pitre Date: Fri Sep 16 18:50:53 2005 +0200 [ALSA] clean suspend/resume calls for ac97_bus_type AC97 Codec A single call to the driver suspend/resume method for each device is enough. The level and SUSPEND_*/RESUME_* arguments are deprecated and said to be removed eventually anyway (no other subsystem are using them anymore except platform devices). Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 72e75de2df9a7116d0afbcd5810b2a8fd4bf7559 Author: Nicolas Pitre Date: Fri Sep 16 18:49:22 2005 +0200 [ALSA] remove redundent assignment to the ac97 device structure AC97 Codec Don't use dev.platform_data to store a reference to the containing ac97_t structure. Such assignment is redundent since we can deduce the ac97_t structure location from the contained device structure. This sets platform_data free for other purposes. Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 3a91e95969b84a56c7fef15ba25a5f6a17dd94b2 Author: Nicolas Pitre Date: Fri Sep 16 18:46:36 2005 +0200 [ALSA] remove bogus match method for ac97_bus AC97 Codec The bus_id is initialized with a generic identifier string which is not really useful for proper driver matching. Let the driver decide what it needs via its probe method instead. Signed-off-by: Nicolas Pitre Signed-off-by: Takashi Iwai commit 460dc98afc6db255344a06c8da1196e2a2744758 Author: Clemens Ladisch Date: Fri Sep 16 16:56:01 2005 +0200 [ALSA] usb-audio: ignore Hercules DJ Console mixer errors USB generic driver Add a quirk entry for the Hercules DJ Console to ignore timeouts on some mixer control transfers. Signed-off-by: Clemens Ladisch commit 1dcee12591320d79e4fc5bcdc4aa8a2522b7afdb Author: Dirk Opfer Date: Wed Sep 14 20:52:25 2005 +0200 [ALSA] Fix pm_message_t in PXA2XX-AC97 driver ARM PXA2XX driver Fix pm_message_t in PXA2XX-AC97 driver. Signed-off-by: Takashi Iwai commit e8dede5a136bd7ef36d1779ea173cfd504dff0cb Author: Takashi Iwai Date: Tue Sep 13 11:28:53 2005 +0200 [ALSA] hda-intel - Disable DMA position auto-correction HDA Intel driver Disable the auto-correction of DMA position temporarily. It doesn't work as expected yet... Signed-off-by: Takashi Iwai commit 84802f0df3425ae0f9987af0d35ea19910479ec0 Author: Sasha Khapyorsky Date: Tue Sep 13 11:25:54 2005 +0200 [ALSA] hda-codec - 'empty' generic mfg-only codec HDA generic driver This creates 'empty' hda generic for unknown MFG-only codecs. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 27bcaa693c866b9bccf94ee5b60eaf705e90c341 Author: Sasha Khapyorsky Date: Tue Sep 13 11:23:13 2005 +0200 [ALSA] no templated index for si3036 modem controls AC97 Codec No index is templated for si3036 modem controls. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 0444e2aca9ac89f571f0bb7781d12818719e4baf Author: Sasha Khapyorsky Date: Tue Sep 13 11:21:30 2005 +0200 [ALSA] no templated index for mc97 controls AC97 Codec No index is templated for mdoem controls. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 06f619ccb3319759c2acf91c7ca02b6b1d9ed343 Author: Daniel Ritz Date: Mon Sep 12 11:47:04 2005 +0200 [ALSA] snd_opl3sa2: add missing pnp_unregister_driver() calls OPL3SA2 driver Signed-off-by: Daniel Ritz Signed-off-by: Takashi Iwai commit 0f21ba7cc3320d33459ecb3f538f1a42040c29cd Author: Eric Kinzie Date: Thu Oct 6 22:19:28 2005 -0700 [ATM]: add support for LECS addresses learned from network From: Eric Kinzie Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit eb98129eec7fa605f0407dfd92d40ee8ddf5cd9a Author: Tom 'spot' Callaway Date: Thu Oct 6 22:14:59 2005 -0700 [SPARC32]: Enable generic IOMAP. This helps some PCI stuff build. Signed-off-by: Tom 'spot' Callaway Signed-off-by: David S. Miller commit 829841146878e082613a49581ae252c071057c23 Author: Linus Torvalds Date: Thu Oct 6 21:54:21 2005 -0700 Avoid 'names_cache' memory leak with CONFIG_AUDITSYSCALL The nameidata "last.name" is always allocated with "__getname()", and should always be free'd with "__putname()". Using "putname()" without the underscores will leak memory, because the allocation will have been hidden from the AUDITSYSCALL code. Arguably the real bug is that the AUDITSYSCALL code is really broken, but in the meantime this fixes the problem people see. Reported by Robert Derr, patch by Rick Lindsley. Acked-by: Al Viro Signed-off-by: Linus Torvalds commit 20c9c825b12fcb8526a29cf20a17a5a3fc581726 Author: Sridhar Samudrala Date: Thu Oct 6 21:37:01 2005 -0700 [SCTP] Fix SCTP socket options to work with 32-bit apps on 64-bit kernels. Adds alignment attribute to a few structures used with SCTP socket options so that the sizes and offsets remain the same when built using either 32 or 64 bit tools. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 5fe467ee9787007dd9b263eb42dde3742deb743b Author: Ivan Skytte Jørgensen Date: Thu Oct 6 21:36:17 2005 -0700 [SCTP] Fix sctp_get{pl}addrs() API to work with 32-bit apps on 64-bit kernels. The old socket options are marked with a _OLD suffix so that the existing 32-bit apps on 32-bit kernels do not break. Signed-off-by: Ivan Skytte Jørgensen Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 2256c13b992b09f1f9563c26457aa048da2865df Author: David S. Miller Date: Thu Oct 6 20:43:54 2005 -0700 [SPARC64]: Probe for power device on ISA bus too. Signed-off-by: David S. Miller commit 76e677e25dd3d8af77d0b3810eacaacaf2f93f2f Author: Bryan Sutula Date: Wed Oct 5 11:02:06 2005 -0600 [IA64] Avoid kernel hang during CMC interrupt storm I've noticed a kernel hang during a storm of CMC interrupts, which was tracked down to the continual execution of the interrupt handler. There's code in the CMC handler that's supposed to disable CMC interrupts and switch to polling mode when it sees a bunch of CMCs. Because disabling CMCs across all CPUs isn't safe in interrupt context, the disable is done with a schedule_work(). But with continual CMC interrupts, the schedule_work() never gets executed. The following patch immediately disables CMC interrupts for the current CPU. This then allows (at least) one CPU to ignore CMC interrupts, execute the schedule_work() code, and disable CMC interrupts on the rest of the CPUs. Acked-by: Keith Owens Signed-off-by: Bryan Sutula Signed-off-by: Tony Luck commit a448a28589a6640736b8af1f2f57616c10bb37d5 Author: Russell King Date: Thu Oct 6 13:09:42 2005 +0100 [MFD] Fix gcc4 build errors in ucb1x00-core.c drivers/mfd/ucb1x00-core.c:555: error: static declaration of 'ucb1x00_class' follows non-static declaration drivers/mfd/ucb1x00.h:109: error: previous declaration of 'ucb1x00_class' was here Since ucb1x00_class isn't used by anything, remove the extern declaration and the symbol export. Signed-off-by: Russell King commit 9ad98c5b4461e7dfa3754963200993a68825eab4 Author: David S. Miller Date: Wed Oct 5 15:12:00 2005 -0700 [SPARC64]: Fix initrd when net booting. By allocating early memory for the firmware page tables, we can write over the beginning of the initrd image. So what we do now is: 1) Read in firmware translations table while still on the firmware's trap table. 2) Switch to Linux trap table. 3) Init bootmem. 4) Build firmware page tables using __alloc_bootmem(). And this keeps the initrd from being clobbered. Signed-off-by: David S. Miller commit e03eb5272b670e5002463c95fdc023410ba18484 Author: Catalin Marinas Date: Wed Oct 5 23:06:36 2005 +0100 [ARM] 2954/1: Allow D and I cache and branch prediction disabling for ARMv6 Patch from Catalin Marinas There is no reason to not allow these config options. They are useful when the hardware has problems. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 782c3fd470abddf2525e34cf3131215a8f95e834 Author: Martin Habets Date: Wed Oct 5 12:21:36 2005 -0700 [SPARC]: Remove some duplicated sparc32 config items Remove some duplicated items due to the inclusion of the general drivers/Kconfig file. These are now taken from drivers/char/Kconfig, and can be turned off there as well (which is desirable sometimes). Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 3a867b36c3234673e61f883ebc11ad18f80a176f Author: Ralf Baechle Date: Wed Oct 5 12:16:04 2005 -0700 [AX.25]: Fix packet socket crash Since changeset 98a82febb6340466824c3a453738d4fbd05db81a AX.25 is passing received IP and ARP packets to the stack through netif_rx() but we don't set the skb->mac.raw to right value which may result in a crash with applications that use a packet socket. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 77d8d7a6848c81084f413e1ec4982123a56e2ccb Author: Herbert Xu Date: Wed Oct 5 12:15:12 2005 -0700 [IPSEC]: Document that policy direction is derived from the index. Here is a patch that adds a helper called xfrm_policy_id2dir to document the fact that the policy direction can be and is derived from the index. This is based on a patch by YOSHIFUJI Hideaki and 210313105@suda.edu.cn. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 140e26fcd559f6988e5a9056385eecade19d9b49 Author: YOSHIFUJI Hideaki Date: Wed Oct 5 12:11:41 2005 -0700 [IPV6]: Fix NS handing for proxy/anycast address Timer set up by pneigh_enqueue() ended up calling ndisc_rcv() via pndisc_redo(), which clears LOCALLY_ENQUEUED flag in NEIGH_CB(skb) and NS was queued again. Let's call ndisc_recv_ns() directly to avoid the loop. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 42a39450f830c57432fd4e5644fa81f41ce7156d Author: Stephen Hemminger Date: Wed Oct 5 12:09:31 2005 -0700 [TCP]: BIC coding bug in Linux 2.6.13 Missing parenthesis in causes BIC to be slow in increasing congestion window. Spotted by Injong Rhee. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit fab10fe37ad8dc4388fc444c89ef5aefe906354f Author: Yan Zheng Date: Wed Oct 5 12:08:13 2005 -0700 [MCAST] ipv6: Fix address size in grec_size Signed-Off-By: Yan Zheng Acked-by: YOSHIFUJI Hideaki Acked-by: David L Stevens Signed-off-by: David S. Miller commit c0758146adbe39514e75ac860ce7e49f865c2297 Author: Dave Jones Date: Mon Oct 3 15:02:20 2005 -0400 [PATCH] Fix drm 'debug' sysfs permissions Just enables some extra printk's, but still.. Only the sysadmin should be able to do that. Signed-off-by: Linus Torvalds commit 23cb8c297eb939b25e5a628dc9e8a71b17f1c44e Author: Benjamin Herrenschmidt Date: Wed Oct 5 17:43:40 2005 +1000 [PATCH] ppc: Fix timekeeping with HZ=250 on some Mac models Older Macs which uses the VIA chip timers to calibrate the timebase used some code that wouldn't work if HZ wasn't divisible by 100... This fixes it at least for 250. Not totally perfect but should be enough for now (so it at least works with the default value which is now 250). There is still a potential issue with the core using CLOCK_TICK_RATE to maintain xtime and CLOCK_TICK_RATE value on ppc32 is pure crap, but that is a different problem, this patch at least brings us back to our previous situation. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 329d4dd72e5c3393a0c7aeebf3e62df77b196d71 Author: Al Viro Date: Wed Oct 5 08:36:02 2005 +0100 [PATCH] fix the breakage in sparc headers If we switch extern inline to static inline, we'd better switch the pre-declarations we use to say that these puppies have __attribute_const__ on them. Otherwise we get extern declaration followed by static inline one. Which makes gcc unhappy, and for a good reason... Signed-off-by: Al Viro Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit 83fa3400ebcba307a60909824a251be984eb9567 Author: Randy Dunlap Date: Tue Oct 4 22:45:35 2005 -0700 [XFRM]: fix sparse gfp nocast warnings Fix implicit nocast warnings in xfrm code: net/xfrm/xfrm_policy.c:232:47: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 3d2aef668920e8d93b77f145f8f647f62abe75db Author: Randy Dunlap Date: Tue Oct 4 22:45:14 2005 -0700 [TEXTSEARCH]: fix sparse gfp nocast warnings Fix nocast sparse warnings: include/linux/textsearch.h:165:57: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit dd13a285b79ba77416b96ee10f49097f4aaf48c5 Author: Randy Dunlap Date: Tue Oct 4 22:44:45 2005 -0700 [RPC]: fix sparse gfp nocast warnings Fix nocast sparse warnings: net/rxrpc/call.c:2013:25: warning: implicit cast to nocast type net/rxrpc/connection.c:538:46: warning: implicit cast to nocast type net/sunrpc/sched.c:730:36: warning: implicit cast to nocast type net/sunrpc/sched.c:734:56: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 00fa02334540ec795934737cd6e6ef8db2560731 Author: Randy Dunlap Date: Tue Oct 4 22:43:04 2005 -0700 [AF_KEY]: fix sparse gfp nocast warnings Fix implicit nocast warnings in net/key code: net/key/af_key.c:195:27: warning: implicit cast to nocast type net/key/af_key.c:1439:28: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit c6f4fafccfa66f0530587ac3c11bb8fd0b8fe8ab Author: Randy Dunlap Date: Tue Oct 4 22:42:42 2005 -0700 [NETFILTER]: fix sparse gfp nocast warnings Fix implicit nocast warnings in nfnetlink code: net/netfilter/nfnetlink.c:204:43: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 8eea00a44d9f493869f8d30b72e3ed18475be556 Author: Randy Dunlap Date: Tue Oct 4 22:42:15 2005 -0700 [IPVS]: fix sparse gfp nocast warnings From: Randy Dunlap Fix implicit nocast warnings in ip_vs code: net/ipv4/ipvs/ip_vs_app.c:631:54: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit f4a19a56e38442e434b8809915d756469f1e89a2 Author: Randy Dunlap Date: Tue Oct 4 22:41:48 2005 -0700 [DECNET]: fix sparse gfp nocast warnings Fix implicit nocast warnings in decnet code: net/decnet/af_decnet.c:458:40: warning: implicit cast to nocast type net/decnet/dn_nsp_out.c:125:35: warning: implicit cast to nocast type net/decnet/dn_nsp_out.c:219:29: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 17b698856328a42d5874ac87640e2cd84a824eef Author: Randy Dunlap Date: Tue Oct 4 22:41:16 2005 -0700 [CONNECTOR]: fix sparse gfp nocast warnings Fix implicit nocast warnings in connector code: drivers/connector/connector.c:102:24: warning: implicit cast to nocast type drivers/connector/connector.c:114:45: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit de54f3907d2f5d8e25cfafe513811f146b250dee Author: Randy Dunlap Date: Tue Oct 4 22:39:41 2005 -0700 [BONDING]: fix sparse gfp nocast warnings Fix implicit nocast warnings in bonding code: drivers/net/bonding/bond_main.c:1302:49: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 7b5b3f3d826ea87c224c66de9c95c09e7f110ecd Author: Randy Dunlap Date: Tue Oct 4 22:38:44 2005 -0700 [ATM]: fix sparse gfp nocast warnings Fix implicit nocast warnings in atm code: net/atm/atm_misc.c:35:44: warning: implicit cast to nocast type drivers/atm/fore200e.c:183:33: warning: implicit cast to nocast type Also use kzalloc() instead of kmalloc(). Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 9bc39bec87ee3e35897fe27441e979e7c208f624 Author: Pavel Roskin Date: Tue Oct 4 21:33:10 2005 -0400 [PATCH] orinoco: Information leakage due to incorrect padding The orinoco driver can send uninitialized data exposing random pieces of the system memory. This happens because data is not padded with zeroes when its length needs to be increased. Reported by Meder Kydyraliev Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit ce12467d44d7394731ec9e91e032d50b04e502f6 Author: Deepak Saxena Date: Tue Oct 4 16:32:38 2005 -0700 [PATCH] Fix broken IXP4xx GPIO macro Macro ended up backwards during one of cleanups. Found by Alessandro Zummo. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit a5181ab06ddca8071b4eb54ac2c314f7d24825d4 Author: Horst H. von Brand Date: Tue Oct 4 15:58:56 2005 -0700 [NETFILTER]: Fix Kconfig typo Signed-off-by: Horst H. von Brand Signed-off-by: David S. Miller commit 944d2647dded12e2b05ad8ebc020644bb1997ce1 Author: Andi Kleen Date: Wed Oct 5 00:21:39 2005 +0200 [PATCH] x86_64: Drop global bit from early low mappings Drop global bit from early low mappings Suggested by Linus, originally also proposed by Suresh. This fixes a race condition with early start of udev, originally tracked down by Suresh B. Siddha. The problem was that switching to the user space VM would not clear the global low mappings for the beginning of memory, which lead to memory corruption. Drop the global bits. The kernel mapping stays global because it should stay constant. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6d2553612fa329979e6423a5f2410fd7be5aa902 Author: Eric Dumazet Date: Tue Oct 4 15:55:51 2005 -0700 [INET]: Shrink struct inet_ehash_bucket on 32 bits UP No need to align struct inet_ehash_bucket on a 8 bytes boundary. On 32 bits Uniprocessor, that's a waste of 4 bytes per struct (50 %) On other platforms, the attribute is useless, natual alignement is already 8. platform | Size before | Size after patch -------------+-------------+------------------ 32 bits, UP | 8 | 4 32 bits, SMP | 8 | 8 64 bits, UP | 8 | 8 64 bits, SMP | 16 | 16 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 0835ae0f27c0bfde67613d189ef6c537e004a6de Author: David S. Miller Date: Tue Oct 4 15:23:20 2005 -0700 [SPARC64]: Replace cheetah+ code patching with variables. Instead of code patching to handle the page size fields in the context registers, just use variables from which we get the proper values. Signed-off-by: David S. Miller commit c2f480869fa7559fa3532e415e3e3ec49339f208 Author: Nicolas Pitre Date: Tue Oct 4 23:17:53 2005 +0100 [ARM] 2952/1: fix a register clobber list Patch from Nicolas Pitre If gcc decides to assign lr to %0 we're screwed. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 74f8849496b73d2ae4f9c53f61bf59e063ceed88 Author: Nicolas Pitre Date: Tue Oct 4 23:17:52 2005 +0100 [ARM] 2951/1: fix wrong comment Patch from Nicolas Pitre The cmpxchg emulation syscall needs write access. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 0a5b0aa8a331f4346b4b02bc653107304a6abdc5 Author: Sascha Hauer Date: Tue Oct 4 23:17:52 2005 +0100 [ARM] 2950/1: i.MX gpio setup function Patch from Sascha Hauer Current implementation of imx_gpio_mode does not allow to configure all alternate routing possibilities of the i.MX. With this patch every bit in the gpio setup registers has a corresponding bit in the gpio_mode parameter, so every routing should be possible now. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit d78795b6930956fb66238d4d26242482d4a31470 Author: Sascha Hauer Date: Tue Oct 4 23:17:51 2005 +0100 [ARM] 2949/1: Hynix h720x Run mode Patch from Sascha Hauer After coming out of idle mode the h720x goes into slow mode. Switch it back to run mode. Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit fad1c45c939bb246a488be1fa06f539e85b80545 Author: Allan Graves Date: Tue Oct 4 14:53:52 2005 -0400 [PATCH] uml: Fix sysrq-r support for skas mode The old code had the IP and SP coming from the registers in the thread struct, which are completely wrong since those are the userspace registers. This fixes that by pulling the correct values from the jmp_buf in which the kernel state of each thread is stored. Signed-off-by: Allan Graves Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit 71dc036247573e377703233af289019f4aa3176e Author: Jeff Dike Date: Tue Oct 4 14:53:49 2005 -0400 [PATCH] UML - Fix Al's build tidying Al's build tidying missed one bit from me - without this UML doesn't boot. Signed-off-by: Jeff Dike Acked-by: Al Viro Signed-off-by: Linus Torvalds commit c2b513dfbb04d7c94cca145172cfeb91f7683e54 Author: Al Viro Date: Tue Oct 4 17:48:44 2005 +0100 [PATCH] bfs iget() abuses bfs_fill_super() walks the inode table to get the bitmap of free inodes and collect stats. It has no business using iget() for that - it's a lot of extra work, extra icache pollution and more complex code. Switched to walking the damn thing directly. Note: that also allows to kill ->i_dsk_ino in there - separate patch if Tigran can confirm that this field can be zero only for deleted inodes (i.e. something that could only be found during that scan and not by normal lookups). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ce0fe7e70a0ad11097a3773e9f3f0de3d859edf0 Author: Alexey Dobriyan Date: Tue Oct 4 17:43:06 2005 +0100 [PATCH] bfs endianness annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 25e2d79f527b7abce624f30516f3167195b69a2e Author: Al Viro Date: Tue Oct 4 17:40:44 2005 +0100 [PATCH] bogus kfree() in ibmtr On several failure exits in ibmtr we end up doing kfree() on dev->priv, with dev allocated by alloc_trdev() and ->priv never reassigned. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 433992361ce95a1da76b76c9c24d4c957b058aff Author: Al Viro Date: Tue Oct 4 17:36:04 2005 +0100 [PATCH] missing include in megaraid_sas megaraid_sas depends on arch-specific indirect includes pulling fs.h in; on alpha they do not. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e6308be85afee685347fa3440bed10faaa5d6c1a Author: Robert Olsson Date: Tue Oct 4 13:01:58 2005 -0700 [IPV4]: fib_trie root-node expansion The patch below introduces special thresholds to keep root node in the trie large. This gives a flatter tree at the cost of a modest memory increase. Overall it seems to be gain and this was also proposed by one the authors of the paper in recent a seminar. Main table after loading 123 k routes. Aver depth: 3.30 Max depth: 9 Root-node size 12 bits Total size: 4044 kB With the patch: Aver depth: 2.78 Max depth: 8 Root-node size 15 bits Total size: 4150 kB An increase of 8-10% was seen in forwading performance for an rDoS attack. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 87bf9c97b4b3af8dec7b2b79cdfe7bfc0a0a03b2 Author: YOSHIFUJI Hideaki Date: Tue Oct 4 13:00:39 2005 -0700 [IPV6]: Fix infinite loop in udp_v6_get_port(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit c394e458b69632902d65f9e2f39df79314f72908 Author: Anton Altaparmakov Date: Tue Oct 4 13:08:53 2005 +0100 NTFS: Fix a 64-bitness bug where a left-shift could overflow a 32-bit variable which we now cast to 64-bit first (fs/ntfs/mft.c::map_mft_record_page(). Signed-off-by: Anton Altaparmakov commit 18efefa9355119b4f6d9b73b074ebbf9882c37c3 Author: Anton Altaparmakov Date: Tue Oct 4 13:06:00 2005 +0100 NTFS: Fix a stupid bug in __ntfs_bitmap_set_bits_in_run() which caused the count to become negative and hence we had a wild memset() scribbling all over the system's ram. Signed-off-by: Anton Altaparmakov commit 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d Author: Randy Dunlap Date: Tue Oct 4 00:41:22 2005 -0700 [PATCH] sungem: fix gfp flags type Fix nocast sparse warnings in sungen: drivers/net/sungem.h:1040:45: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 81c58732277654a51bb52832e1bc74234bb977bc Author: Randy Dunlap Date: Mon Oct 3 21:24:36 2005 -0700 [PATCH] ns83820: fix gfp flags type Fix implicit nocast warnings in ns83820 code, including __nocast: drivers/net/ns83820.c:603:46: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit f36a29d5672c7698ffe55c7c05107ae77fa698cc Author: Randy Dunlap Date: Mon Oct 3 21:24:45 2005 -0700 [PATCH] ieee80211: fix gfp flags type Fix implicit nocast warnings in ieee80211 code, including __nocast: net/ieee80211/ieee80211_tx.c:215:9: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 67974231d4354fe26aaa39a3153b5c0945b94858 Author: Ion Badulescu Date: Mon Oct 3 22:31:36 2005 -0400 [netdrvr starfire] fix highmem and broken firmware issues Unfortunately, [your patch] might address the crash but doesn't address the real problem. It turns out that the problem is one of padding (the firmware cksum engine works only on 32-bit chunks, yuck), so the special casing for length == 1 wasn't sufficient anyway. This patch addresses the issue, as well the other issue of i386 + CONFIG_HIGHMEM being broken. It is pretty much the same workaround that Adaptec themselves used in their Windows driver. I have yet to check if it fixes the problem when the skb is non-linear, but this patch _will_ solve the problem for 99% of the users out there (those not using sendfile). Signed-off-by: Ion Badulescu Signed-off-by: Jeff Garzik commit 32fa2bfcf882f8901ca206e33b0d8975cc8e89a2 Author: Grant Coady Date: Sat Sep 10 00:14:05 2005 +1000 [PATCH] net/Kconfig: convert pocket_adapter ISA to PARPORT This patch changes pocket and parallel adaptors to depend on PARPORT instead of ISA in order to get the option in newer SuperIO based systems. Signed-off-by: Grant Coady Signed-off-by: Jeff Garzik commit 49a9db07abd4ac89693dbd4dcd92fcd1f30ece00 Author: Wade Farnsworth Date: Mon Oct 3 22:21:33 2005 -0400 [PATCH] emac: add support for platform-specific unsupported PHY features This patch adds support to the ibm_emac driver for platform-specific unsupported PHY features. The patch attempts to determine the highest speed and duplex when autonegotiation is unsupported. Signed-off-by: Wade Farnsworth Signed-off-by: Jeff Garzik commit 32b5bfab9a09b19ea9a7d902b249ebf311fd2999 Author: Philippe De Muyter Date: Thu Sep 22 11:09:44 2005 +0200 [PATCH] tulip DC21143 rev 48 10Mbit HDX fix The patch below is necessary to allow my Digital DS21143 Tulip rev 48 ethernet interface to work in a 10Mbit Half Duplex network. Without it, the driver keeps retrying other modes in an endless loop. It seems like someone already had the same problem with a rev 65 board :) Signed-off-by: Philippe De Muyter Signed-off-by: Jeff Garzik commit 217df670d9a4da036d68b22500ac06128811d5c8 Author: Jay Vosburgh Date: Mon Sep 26 16:11:50 2005 -0700 [PATCH] fix bonding crash, remove old ABI support David S. Miller wrote: >I think removing support for older ifenslave binaries is >the least painful solution to this problem. This patch removes backwards compatibility for old ifenslave binaries (ifenslave prior to verison 1.0.0). I did not similarly modify ifenslave itself; with sysfs on the horizon, I don't see that as being worthwhile. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 9123e0d78990246304fe681167b8d8097f1e02d7 Author: Ursula Braun Date: Fri Sep 30 10:17:24 2005 +0200 [PATCH] s390: qeth driver fixes From: Peter Tiedemann From: Frank Pavlic minor qeth fixes: - free old skb in qeth_realloc_headroom after duplicating skb - disable IPV6 support for Hipersockets devices - call ccw_device_set_offline on every channel regardless of the return value of the prior ccw_device_set_offline calls - allocate qdio structures in DMA-area - schedule recovery of appropriate card when cable has been inserted again. - add missing initialization of card->lock - write sequence number in skb->cb for SNA protocol which requires strictly serialized packets. Signed-off-by: Frank Pavlic diffstat: qeth.h | 2 ++ qeth_main.c | 37 +++++++++++++++++-------------------- 2 files changed, 19 insertions(+), 20 deletions(-) Signed-off-by: Jeff Garzik commit bb53d6d0e70cd0749a7844efc62cefeb24b134b6 Author: Komuro Date: Mon Oct 3 22:03:28 2005 -0400 [netdrvr] fix smc91c92_cs multicast bug The smc91c92_cs multicast does not work if the count of multicast address is 1. Signed-off-by: Signed-off-by: Jeff Garzik commit 8cb6108baee9dcd1dc96f476fe217d6a6b53c994 Author: Randy Dunlap Date: Sun Oct 2 22:41:09 2005 -0700 [PATCH] ieee80211: fix gfp flags type Fix implicit nocast warnings in ieee80211 code: net/ieee80211/ieee80211_tx.c:215:9: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 0a1c80f1115b9a1aacf00a312a532ceef49dfa1b Author: Randy Dunlap Date: Sun Oct 2 22:42:11 2005 -0700 [PATCH] ns83820: fix gfp flags type Fix implicit nocast warnings in ns83820 code: drivers/net/ns83820.c:603:46: warning: implicit cast to nocast type Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit c2681dd8c71c8fb4ca530f94536550fcd843aae4 Author: Stephen Hemminger Date: Mon Oct 3 12:03:13 2005 -0700 [PATCH] skge: set mac address oops with bonding Skge driver was bringing link up/down when changing mac address. This doesn't work in the bonding environment, and is more effort than needed. Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=5271 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit fdc657c66678551c7987dc23a78ae1a26251276f Author: David S. Miller Date: Mon Oct 3 17:37:27 2005 -0700 [SUNSU]: Fix bogus locking in sunsu_change_mouse_baud() The lock is not held when calling this function, so we shouldn't drop then reacquire it. Based upon a report from Jim MacBaine. Signed-off-by: David S. Miller commit 3115624eda34d0f4e673fc6bcea36b7ad701ee33 Author: Adrian Bunk Date: Mon Oct 3 17:37:02 2005 -0700 [SPARC]: "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ed39f731ab2e77e58122232f6e27333331d7793d Author: David S. Miller Date: Mon Oct 3 16:25:23 2005 -0700 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 7ce312467edc270fcbd8a699efabb37ce1802b98 Author: David S. Miller Date: Mon Oct 3 16:07:30 2005 -0700 [IPV4]: Update icmp sysctl docs and disable broadcast ECHO/TIMESTAMP by default It's not a good idea to be smurf'able by default. The few people who need this can turn it on. Signed-off-by: David S. Miller commit 3e56a40bb36f1f73b4eac2ffe267c5357811e321 Author: Herbert Xu Date: Mon Oct 3 14:36:32 2005 -0700 [IPV4]: Get rid of bogus __in_put_dev in pktgen This patch gets rid of a bogus __in_dev_put() in pktgen.c. This was spotted by Suzanne Wood. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e5ed639913eea3e4783a550291775ab78dd84966 Author: Herbert Xu Date: Mon Oct 3 14:35:55 2005 -0700 [IPV4]: Replace __in_dev_get with __in_dev_get_rcu/rtnl The following patch renames __in_dev_get() to __in_dev_get_rtnl() and introduces __in_dev_get_rcu() to cover the second case. 1) RCU with refcnt should use in_dev_get(). 2) RCU without refcnt should use __in_dev_get_rcu(). 3) All others must hold RTNL and use __in_dev_get_rtnl(). There is one exception in net/ipv4/route.c which is in fact a pre-existing race condition. I've marked it as such so that we remember to fix it. This patch is based on suggestions and prior work by Suzanne Wood and Paul McKenney. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a5e7c210fefd2454c757a3542e41063407ca7108 Author: David S. Miller Date: Mon Oct 3 14:21:58 2005 -0700 [IPV6]: Fix leak added by udp connect dst caching fix. Based upon a patch from Mitsuru KANDA Signed-off-by: David S. Miller commit f36d6ab182a5c68e92ea3e85821dde9d29bfe284 Author: Yan Zheng Date: Mon Oct 3 14:19:15 2005 -0700 [IPV6]: Fix ipv6 fragment ID selection at slow path Signed-Off-By: Yan Zheng Signed-off-by: David S. Miller commit 444fc8fc3a1f926fa224655b8950bd853368c1a3 Author: Herbert Xu Date: Mon Oct 3 14:18:10 2005 -0700 [IPV4]: Fix "Proxy ARP seems broken" Meelis Roos wrote: > RK> My firewall setup relies on proxyarp working. However, with 2.6.14-rc3, > RK> it appears to be completely broken. The firewall is 212.18.232.186, > > Same here with some kernel between 14-rc2 and 14-rc3 - no reposnse to > ARP on a proxyarp gateway. Sorry, no exact revison and no more debugging > yet since it'a a production gateway. The breakage is caused by the change to use the CB area for flagging whether a packet has been queued due to proxy_delay. This area gets cleared every time arp_rcv gets called. Unfortunately packets delayed due to proxy_delay also go through arp_rcv when they are reprocessed. In fact, I can't think of a reason why delayed proxy packets should go through netfilter again at all. So the easiest solution is to bypass that and go straight to arp_process. This is essentially what would've happened before netfilter support was added to ARP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 496a22b08fa326bf17c11eb900e0505aa9da3506 Author: Russell King Date: Mon Oct 3 14:16:34 2005 -0700 [NET]: Fix "sysctl_net.c:36: error: 'core_table' undeclared here" During the build for ARM machine type "fortunet", this error occurred: CC net/sysctl_net.o net/sysctl_net.c:36: error: 'core_table' undeclared here (not in a function) It appears that the following configuration settings cause this error due to a missing include: CONFIG_SYSCTL=y CONFIG_NET=y # CONFIG_INET is not set core_table appears to be declared in net/sock.h. if CONFIG_INET were defined, net/sock.h would have been included via: sysctl_net.c -> net/ip.h -> linux/ip.h -> net/sock.h so include it directly. Signed-off-by: Russell King Signed-off-by: David S. Miller commit 81c3d5470ecc70564eb9209946730fe2be93ad06 Author: Eric Dumazet Date: Mon Oct 3 14:13:38 2005 -0700 [INET]: speedup inet (tcp/dccp) lookups Arnaldo and I agreed it could be applied now, because I have other pending patches depending on this one (Thank you Arnaldo) (The other important patch moves skc_refcnt in a separate cache line, so that the SMP/NUMA performance doesnt suffer from cache line ping pongs) 1) First some performance data : -------------------------------- tcp_v4_rcv() wastes a *lot* of time in __inet_lookup_established() The most time critical code is : sk_for_each(sk, node, &head->chain) { if (INET_MATCH(sk, acookie, saddr, daddr, ports, dif)) goto hit; /* You sunk my battleship! */ } The sk_for_each() does use prefetch() hints but only the begining of "struct sock" is prefetched. As INET_MATCH first comparison uses inet_sk(__sk)->daddr, wich is far away from the begining of "struct sock", it has to bring into CPU cache cold cache line. Each iteration has to use at least 2 cache lines. This can be problematic if some chains are very long. 2) The goal ----------- The idea I had is to change things so that INET_MATCH() may return FALSE in 99% of cases only using the data already in the CPU cache, using one cache line per iteration. 3) Description of the patch --------------------------- Adds a new 'unsigned int skc_hash' field in 'struct sock_common', filling a 32 bits hole on 64 bits platform. struct sock_common { unsigned short skc_family; volatile unsigned char skc_state; unsigned char skc_reuse; int skc_bound_dev_if; struct hlist_node skc_node; struct hlist_node skc_bind_node; atomic_t skc_refcnt; + unsigned int skc_hash; struct proto *skc_prot; }; Store in this 32 bits field the full hash, not masked by (ehash_size - 1) Using this full hash as the first comparison done in INET_MATCH permits us immediatly skip the element without touching a second cache line in case of a miss. Suppress the sk_hashent/tw_hashent fields since skc_hash (aliased to sk_hash and tw_hash) already contains the slot number if we mask with (ehash_size - 1) File include/net/inet_hashtables.h 64 bits platforms : #define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\ (((__sk)->sk_hash == (__hash)) ((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \ ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports)) && \ (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif)))) 32bits platforms: #define TCP_IPV4_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\ (((__sk)->sk_hash == (__hash)) && \ (inet_sk(__sk)->daddr == (__saddr)) && \ (inet_sk(__sk)->rcv_saddr == (__daddr)) && \ (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif)))) - Adds a prefetch(head->chain.first) in __inet_lookup_established()/__tcp_v4_check_established() and __inet6_lookup_established()/__tcp_v6_check_established() and __dccp_v4_check_established() to bring into cache the first element of the list, before the {read|write}_lock(&head->lock); Signed-off-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 399de50bbbb2501a6db43daaa8a2dafbc9bcfe0c Author: Michael Chan Date: Mon Oct 3 14:02:39 2005 -0700 [TG3]: Refine AMD K8 write-reorder chipset test. Test for VIA K8T800 north bridge instead of AMD K8 HyperTransport bridge based on new information from Andi Kleen. The AMD HyperTransport interface is not responsible for PCI transactions and so the re-ordering is more likely done by the VIA north bridge. This code is subject to change if we get more information from AMD or VIA. PCI Express devices are excluded from doing the read flush since all chipsets in the write_reorder list are PCI chipsets. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a232f76732e11c91c2215d3a43cf9ebc7f939939 Author: Al Viro Date: Mon Oct 3 14:01:37 2005 -0700 [CASSINI]: Convert to ethtool_ops Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 325ed8239309cb29f10ea58c5a668058ead11479 Author: Herbert Xu Date: Mon Oct 3 13:57:23 2005 -0700 [NET]: Fix packet timestamping. I've found the problem in general. It affects any 64-bit architecture. The problem occurs when you change the system time. Suppose that when you boot your system clock is forward by a day. This gets recorded down in skb_tv_base. You then wind the clock back by a day. From that point onwards the offset will be negative which essentially overflows the 32-bit variables they're stored in. In fact, why don't we just store the real time stamp in those 32-bit variables? After all, we're not going to overflow for quite a while yet. When we do overflow, we'll need a better solution of course. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit ddea7be0ec8d1374f0b483a81566ed56ec9f3905 Author: Ravikiran G Thirumalai Date: Mon Oct 3 10:36:28 2005 -0700 [PATCH] x86_64: Fix numa node topology detection for srat based x86_64 boxes 2.6.14-rc2 does not assign cpus to proper nodeids on our em64t numa boxen. Our boxes use acpi srat for parsing the numa information. srat_detect_node() used phys_proc_id[] to get to the cpu's local apic id, but phys_proc_id[] represents the cpu<->initial_apic_id mapping. The following patch fixes this problem. Now apicid_to_node[] is properly indexed with the local apic id. Signed-off-by: Ravikiran Thirumalai Acked-by: Suresh Siddha Cc: Andi Kleen Signed-off-by: Linus Torvalds commit d6b9acc0c6c4a7c5d484d15271a5274656d0864f Author: Paul Jackson Date: Mon Oct 3 00:29:10 2005 -0700 [PATCH] Document patch subject line better Improve explanation of the Subject line fields in Documentation/SubmittingPatches Canonical Patch Format. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 51c928c34fa7cff38df584ad01de988805877dba Author: James Bottomley Date: Sat Oct 1 09:38:05 2005 -0500 [SCSI] Legacy MegaRAID: Fix READ CAPACITY Some Legacy megaraid cards can't actually cope with the scatter/gather version of the READ CAPACITY command (which is what we now send them since altering all SCSI internal I/O to go via the block layer). Fix this (and a few other broken megaraid driver assumptions) by sending the non-sg version of the command if the sg list only has a single element. Signed-off-by: James Bottomley commit 75f8426c17bc091260a6f7536ba10767596e15eb Author: Paul Jackson Date: Sun Oct 2 18:01:42 2005 -0700 [PATCH] Document from line in patch format Document more details of patch format such as the "from" line and the "---" marker line, and provide more references for patch guidelines. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit 2c3a0540999ac9bd7147fb98833224a58cdaf217 Author: Catalin Marinas Date: Sun Oct 2 22:34:35 2005 +0100 [ARM] 2943/1: Clear the exclusive monitor in v6_early_abort Patch from Catalin Marinas Data abort caused by ldrex/strex can leave the exclusive monitor in an unpredictable state. It is recommended that a clrex/strex is performed to clear this state. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit d70ddac1bf3a8b102996588010ca87018c3a4a04 Author: Richard Henderson Date: Sun Oct 2 12:49:52 2005 -0700 [PATCH] alpha: fix kernel alignment traps Pass in the pointer to the on-stack registers rather than using them directly as the arguments. Ivan noticed that I missed a spot when purging the registers as first stack parameter idiom. Signed-off-by: Linus Torvalds commit 97af50f60ff1202b0dd9ce481d4cf98c6a578bec Author: James Bottomley Date: Sun Oct 2 15:22:35 2005 -0500 [SCSI] aic7xxx/aic79xx: fix module removal path not to panic In these drivers, scsi_remove_host() is called too late, at the point it is called, the driver has already shut down too far to accept any I/O that the shutdown might generate. Any generated I/O actually triggers a panic. Fix this by calling scsi_remove_host() as early as possible and not calling scsi_host_put() until just before we kfree the ahc_softc. Signed-off-by: James Bottomley commit 9e70592fcd87c90e9e98090d66cb79f39d740d4a Author: James Bottomley Date: Sun Oct 2 12:59:49 2005 -0500 [SCSI] fix potential panic with proc on module removal There's a problem in our host release in that it calls scsi_proc_hostdir_rm(). However, if you hold a reference to the host as you remove the module, the host template (which proc uses) will be freed and the system will panic when the host device is finally released. Fix this by moving scsi_proc_hostdir_rm() to where it should be: in scsi_remove_host(). Signed-off-by: James Bottomley commit 487fd4eb1445407c9760af08b0b34c3f4cdb4afc Author: Russell King Date: Sun Oct 2 18:12:03 2005 +0100 [ARM] Fix init printk for EBSA110 network driver, and link timer Arrange for the initialisation printks to happen after we've registered the network interface, so we know what name the device is. Also, check the link every 500ms (and use msecs_to_jiffies.) Signed-off-by: Russell King commit 0e3a64e2162f971180bf1fdd91c263dbdfcfd385 Author: Russell King Date: Sun Oct 2 18:02:25 2005 +0100 [ARM] Fix EBSA110 network driver link detection EBSA110 link detection didn't read the register - it wrote it. Oops. Signed-off-by: Russell King commit 036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 Author: Sven Henkel Date: Sun Oct 2 08:30:33 2005 +1000 [PATCH] ppc32: Add new iBook 12" to PowerMac models table This adds the new iBook G4 (manufactured after July 2005) to the PowerMac models table. The model name (PowerBook6,7) is taken from a 12" iBook, I don't know if it also matches the 14" version. The patch applies to a vanilla 2.6.13.2 kernel. Signed-off-by: Sven Henkel Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 14bfd1ff94f519a59b1e88e682819332d7e98171 Author: Sven Henkel Date: Sun Oct 2 08:29:18 2005 +1000 [PATCH] pmac/radeonfb: Add suspend support for M11 chip in new iBook 12" This adds suspend support for the Radeon M11 chip in 12" iBooks manufactured after July 2005. I don't know if the new 14" iBooks also have that chip, so they might also be supported. The chip identifies itself as "RV350 NV" (pci id 0x4e56), revision 0x80. Apple calls it "Snowy", xfree86 names it "ATI FireGL Mobility T2 (M11) NV (AGP)". So, we seem to be lucky here: The suspend-code for the M10 (which also is a "RV350 NV") works flawless for that chip. Signed-off-by: Sven Henkel Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 31f919c3296a30427b18458b13c308513a62c3b9 Author: Vincent Sanders Date: Sat Oct 1 22:56:34 2005 +0100 [ARM] 2945/1: ARM fortunet fails to build because of missing include Patch from Vincent Sanders When building the fortunet ARM platform it fails to compile because of missing include. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 9f4426dde2be352aabc326539eccc726cea2d98c Author: Vincent Sanders Date: Sat Oct 1 22:56:34 2005 +0100 [ARM] 2944/1: GCC 4 mx1ads serial driver compile fix Patch from Vincent Sanders When building the mx1ads ARM platforms the serial driver fails to compile with GCC 4.01 due to extern/static ambiguity. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 14bf01bb0599c89fc7f426d20353b76e12555308 Author: Linus Torvalds Date: Sat Oct 1 11:04:18 2005 -0700 Fix inequality comparison against "task->state" We should always use bitmask ops, rather than depend on some ordering of the different states. With the TASK_NONINTERACTIVE flag, the inequality doesn't really work. Oleg Nesterov argues (likely correctly) that this test is unnecessary in the first place. However, the minimal fix for now is to at least make it work in the presense of TASK_NONINTERACTIVE. Waiting for consensus from Roland & co on potential bigger cleanups. Signed-off-by: Linus Torvalds commit fd2e54b35bd70d11c160ded4834e2378e915356e Author: Diego Calleja Date: Sat Oct 1 17:00:48 2005 +0200 [PATCH] trivial #if -> #ifdef Use '#ifdef' consistently on __KERNEL__. This was reported as bug #5340 (isn't easier to send a fix than report the bug?!) Signed-off-by: Diego Calleja Signed-off-by: Linus Torvalds commit 2d8ab6ad6edf0e8709da9ad24e3f023503f76cee Author: Ananth N Mavinakayanahalli Date: Sat Oct 1 13:14:17 2005 -0400 [PATCH] ppc64: fix up()/down() usage for kprobe_mutex The incorrect kprobe_mutex usage on x86_64 had percolated to ppc64 too. First noticed by Yanmin Zhang. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Linus Torvalds commit 702c96d55059b4a8e5b1eb112ee3b1804708a1bd Author: Deepak Saxena Date: Fri Sep 30 16:20:22 2005 -0700 [PATCH] ARM: Fix IXP2000 serial port resource range. For real this time. Serial port only needs 32 bytes of resource space but we are currently asking for 64K. Signed-off-by: Deepak Saxena [ diff went missing first time due to corrupted patch ] Signed-off-by: Linus Torvalds commit f0e837d9182d7903bde3ebafbd1d0d68c6d32d43 Author: Francois Romieu Date: Fri Sep 30 16:54:02 2005 -0700 [PATCH] r8169: tone down the r8169 driver Tone down the r8169 driver As an alternative, people can use the boot time 'debug' option and/or use 'ethtool -s ethX msglvl xyz'. The different messages are listed at: http://www.zoreil.com/~romieu/r8169/doc/msglvl.txt Signed-off-by: Francois Romieu Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9487e48a34d7ad606f40a76080475a522a27cff Author: Benjamin Herrenschmidt Date: Sat Oct 1 09:21:25 2005 +1000 [PATCH] pmac: fix cpufreq for old tipb 550Mhz The old 550Mhz titanium powerbook can switch to a lower frequency (500Mhz). A user has been repeately reporting overtemp conditions on his machine at high speed so this simple patch adds support to PowerMac cpufreq for this machine. The difference in frequency isn't big but seem enough to fix that user's problems. The patch has been around for some time now and doesn't seem to cause any problem, so I suppose it could go in now. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Alain RICHARD Signed-off-by: Linus Torvalds commit 69d37960b578be0a69383bd71d06c1fcfb86e8b9 Author: Deepak Saxena Date: Fri Sep 30 16:20:22 2005 -0700 [PATCH] Fix IXP2000 serial port resource range Serial port only needs 32 bytes of resource space but we are currently asking for 64K. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit aba7a22f291c13448177b28e0e3d01260ed04fbe Author: Michael S. Tsirkin Date: Fri Sep 30 13:55:50 2005 -0700 [IB] mthca: Fix memory leak on device close Remember to free the multicast group context memory table. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 195331d7c9813fe7f1a93c09afa2c7dcdf2790a8 Author: Wim Van Sebroeck Date: Thu Sep 29 16:22:30 2005 +0200 [WATCHDOG] pcwd_pci.c add debug module_param Add debugging code for the pcwd_pci driver. Signed-off-by: Wim Van Sebroeck commit a0800f6da7c4590d49ae513d9d5ee8b1ad203b82 Author: Wim Van Sebroeck Date: Thu Sep 29 16:21:50 2005 +0200 [WATCHDOG] pcwd_pci.c control status + boot-code clean-up * Clean-up control status code (use control status defines + change pcipcwd_clear_status) * Clean-up boot-code (move card info to pcipcwd_show_card_info() ) Signed-off-by: Wim Van Sebroeck commit d70ed6075f15bdbb0548d162394bf10332769c88 Author: Roland Dreier Date: Wed Sep 28 19:56:57 2005 -0700 [IPoIB] Rename IPoIB's path_lookup() to avoid name clashes Rename IPoIB driver's path_lookup() to ipoib_path_lookup() to avoid a clashes with the kernel global path_lookup(). We don't hit this with the current kernel source, but some external patches seem to trigger this, and it's cleaner to avoid clashing with global names anyway. Signed-off-by: Roland Dreier refs/heads/for-linus commit 1640a2c385a860ef25be4a8d18a528c4b6f02bd6 Author: Mark Haverkamp Date: Tue Sep 20 12:57:11 2005 -0700 [SCSI] aacraid: remove aac_insert_entry Received from Mark Salyzyn from Adaptec. High Priority Queues have *never* been used in the entire history of the aac based adapters. Associated with this, aac_insert_entry can be removed, SavedIrql can be removed & padding variable can be removed. With the movement of SavedIrql out & replaced with an automatic variable qflags, the locking can be refined somewhat. The sparse warnings did not catch the need for byte swapping in the 'dprintk' debugging print macros, so fixed this up when this code was moved outside of the now refined locking. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 63a70eeaafe0e17e7f45cba495cb457d06070419 Author: Mark Haverkamp Date: Tue Sep 20 12:57:04 2005 -0700 [SCSI] aacraid: fib size math fix Received from Mark Salyzyn from Adaptec. The size of the command packet's scatter gather list maximum size was miscalculated in the low range leading to the driver initialization limiting the maximum i/o size that could go to the Adapter. There were no negative operational side effects resulting from this bad math, only a subtle limit in performance of the Adapter at the top end of the range. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 9203344cb8ecc554a1d36eae6661235ed422cf59 Author: Mark Haverkamp Date: Tue Sep 20 12:56:50 2005 -0700 [SCSI] aacraid: initialization timeout Received from Mark Salyzyn from Adaptec. In the rare instances where the adapter, or the motherboard, is misbehaving; driver initialization or shutdown becomes problematic. By introducing a 3 minute timeout on the first interrupt driven command during initialization, or the issuance of the adapter shutdown command during driver unload, we can resolve the lockup problems induced by common (but rare) hardware misbehaviors. The timeout during initialization, should it occur, is accompanied by a message presented to the console and the logs indicating that the user should inspect and resolve problems with interrupt routing. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 08efb7b6116927c8b6e0af5064448e3aa13300e6 Author: Mark Haverkamp Date: Tue Sep 20 12:56:36 2005 -0700 [SCSI] aacraid: error return checking This patch adds some additional error return checking and error return value propagation during initialization. Also, the deprecation of pci_module_init with pci_register_driver along with the change in return values. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 131256cf203d0df62014dda8453a70cb6af0d0bb Author: Mark Haverkamp Date: Mon Sep 26 13:04:56 2005 -0700 [SCSI] aacraid: handle AIF hotplug events (update) Received from Mark Salyzyn from Adaptec. Hotplug sniffs the AIFs (events) from the adapter and if a container change resulting in the device going offline (container zero), online (container zero completed) or changing capacity (morph) it will take actions by calling the appropriate API. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 2f130980d14cb938226011875ca5224cd46dc1f9 Author: Mark Haverkamp Date: Mon Sep 26 13:02:15 2005 -0700 [SCSI] aacraid: aacraid: AIF preallocation (update) Recevied from Mark Salyzyn from Adaptec. Aif pre-allocation is used to pull the kmalloc outside of the locks. Applies to the scsi-misc-2.6 git tree. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 7a8cf29d69e077dfe90e327859201fd9b75a47ce Author: Mark Haverkamp Date: Thu Sep 22 09:15:24 2005 -0700 [SCSI] aacraid: Greater than 2TB capacity support Received from Mark Salyzyn from Adaptec. There are a few adapters that are capable of creating devices with this large of a capacity, but now that we have the large fib support in, the management applications will be capable of generating them. The problem is, once they are created, the driver will not be able to access the devices correctly without this patch. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit c4a3e0a529ab3e65223e81681c7c6b1bc188fa58 Author: Bagalkote, Sreenivas Date: Tue Sep 20 17:46:58 2005 -0400 [SCSI] MegaRAID SAS RAID: new driver Signed-off-by: Sreenivas Bagalkote Signed-off-by: James Bottomley commit fe8b2304e54552cea113318e2f66c45628130fdc Author: Christoph Hellwig Date: Sun Sep 25 23:10:33 2005 +0200 [SCSI] sas: fix remote phy removal Brown paperbag bug: sas_rphy_delete was ordered completely wrong. Fix it up to be the same order as sas_phy_delete or fc_rport_terminate and fix rphy objects that leaked after module removal. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 44550322cb601ac3f882e7438bbeec971fa1b1a3 Author: Andrew Vasquez Date: Tue Sep 20 13:32:11 2005 -0700 [SCSI] qla2xxx: fix remote port timeout with qla2xxx driver This patch fixes a hole in the rport unblock handling when processing fabric events via the ADISC/PLOGI device state machine. Original code would not properly 'unblock' the port upon the port reloging into the fabric. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 6f3a20242db2597312c50abc11f1e747c5d2326a Author: James Bottomley Date: Thu Sep 22 20:33:28 2005 -0500 [SCSI] allow REPORT LUN scanning even for LUN 0 PQ of 3 Currently we just ignore the device, which means there are a few arrays out there that we don't find. This patch updates the scsi_report_lun_scan() to take a target instead of a device so it can be called on a return of SCSI_SCAN_TARGET_PRESENT, which is what a PQ 3 device returns. Signed-off-by: James Bottomley commit 49bfd8db4a39ea14fb3780b162012b4b3611fce8 Author: adam radford Date: Wed Sep 21 17:20:14 2005 -0700 [SCSI] 3ware 9000: Add support for 9550SX controllers Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 68ce1eb54056e4fad6e73968e958b926d28cb0dd Author: Andrew Morton Date: Wed Sep 21 09:46:54 2005 -0700 [SCSI] lpfc build fix gcc-2.95.x doesn't do anonymous unions. Signed-off-by: Andrew Morton Signed-off-by: James Bottomley