commit 95511ad4342cd094e62c807f6631b9a19cc6b129 Author: Adrian Bunk Date: Sat Jul 7 06:14:02 2007 +0200 DLM must depend on SYSFS The dependency of DLM on SYSFS got lost in commit 6ed7257b46709e87d79ac2b6b819b7e0c9184998 resulting in the following compile error with CONFIG_DLM=y, CONFIG_SYSFS=n: <-- snip --> ... LD .tmp_vmlinux1 fs/built-in.o: In function `dlm_lockspace_init': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/fs/dlm/lockspace.c:231: undefined reference to `kernel_subsys' fs/built-in.o: In function `configfs_init': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/fs/configfs/mount.c:143: undefined reference to `kernel_subsys' make[1]: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 38377be88ab878f44c687dbd704d4d044b000c97 Author: Dave Jones Date: Fri Jul 6 14:59:43 2007 -0400 Clean up E7520/7320/7525 quirk printk. The printk level in this printk is bogus, as the previous printk didn't have a terminating \n resulting in .. Intel E7520/7320/7525 detected.<6>Disabling irq balancing and affinity It also never printed a \n at all in the case where we didn't do the quirk. Change it to only make noise if it actually does something useful. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 40e48eed84e65f909f5ac3d7a39547b70aacf90f Author: Adrian Bunk Date: Sat Jul 7 00:54:09 2007 +0200 include/linux/kallsyms.h must #include This patch fixes the following 2.6.22 regression with CONFIG_KALLSYMS=n: <-- snip --> ... CC arch/m32r/kernel/traps.o In file included from /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/arch/m32r/kernel/traps.c:14: /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h: In function 'lookup_symbol_name': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:66: error: 'ERANGE' undeclared (first use in this function) /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:66: error: (Each undeclared identifier is reported only once /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:66: error: for each function it appears in.) /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h: In function 'lookup_symbol_attrs': /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/kallsyms.h:71: error: 'ERANGE' undeclared (first use in this function) make[2]: *** [arch/m32r/kernel/traps.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 1c39858b5dd46004b12c5acd26d8df346bef8a10 Author: David Woodhouse Date: Sat Jul 7 14:58:39 2007 -0400 Fix use-after-free oops in Bluetooth HID. When cleaning up HIDP sessions, we currently close the ACL connection before deregistering the input device. Closing the ACL connection schedules a workqueue to remove the associated objects from sysfs, but the input device still refers to them -- and if the workqueue happens to run before the input device removal, the kernel will oops when trying to look up PHYSDEVPATH for the removed input device. Fix this by deregistering the input device before closing the connections. Signed-off-by: David Woodhouse Acked-by: Marcel Holtmann Signed-off-by: Linus Torvalds commit d23cf676d0e9d1fdc066d2dcb7f8bc0e2d4c75bd Author: Christoph Lameter Date: Fri Jul 6 11:17:32 2007 -0700 slub: remove useless EXPORT_SYMBOL kmem_cache_open is static. EXPORT_SYMBOL was leftover from some earlier time period where kmem_cache_open was usable outside of slub. (Fixes powerpc build error) Signed-off-by: Chrsitoph Lameter Cc: Johannes Berg Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3000e031cf6a1f58228357d7c317f66e670627f Author: maximilian attems Date: Fri Jul 6 11:17:32 2007 -0700 MAINTAINERS new kernel janitors ml davem kindly moved the list from osdl to vger. Signed-of-by: maximilian attems Cc: Alexey Dobriyan Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95069f89e80bb49ecc1b135bf85747e8dc6681f9 Author: Andres Salomon Date: Fri Jul 6 11:17:30 2007 -0700 GEODE: reboot fixup for geode machines with CS5536 boards Writing to MSR 0x51400017 forces a hard reset on CS5536-based machines, this has the reboot fixup do just that if such a board is detected. Acked-by: Jordan Crouse Signed-off-by: Andres Salomon Cc: Alan Cox Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1feb17e286339382a1ae36e0fecc4d88c2d7f123 Merge: dadde13... 25442ca... Author: Linus Torvalds Date: Fri Jul 6 10:30:12 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: [NETPOLL]: Fixups for 'fix soft lockup when removing module' [NET]: net/core/netevent.c should #include [NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values [NET] skbuff: remove export of static symbol SCTP: Add scope_id validation for link-local binds SCTP: Check to make sure file is valid before setting timeout SCTP: Fix thinko in sctp_copy_laddrs() commit dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5 Merge: 23c1fb5... 4b3e975... Author: Linus Torvalds Date: Fri Jul 6 10:29:33 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix scheduling latency issue on 24K, 34K and 74K cores [MIPS] Add macros to encode processor revisions. [MIPS] RM7000: Enable ICACHE_REFILLS_WORKAROUND_WAR. [MIPS] SMTC: Fix cut'n'paste bug in Kconfig.debug [MIPS] Change libgcc-style functions from lib-y to obj-y [MIPS] Fix timer/performance interrupt detection [MIPS] AP/SP: Avoid triggering the 34K E125 performance issue [MIPS] 64-bit TO_PHYS_MASK macro for RM9000 processors commit 23c1fb52961bc24bd3a8078eefc49eed533b2b38 Author: Peter Zijlstra Date: Fri Jul 6 13:35:34 2007 +0200 mm: fixup /proc/vmstat output Line up the vmstat_text with zone_stat_item enum zone_stat_item { /* First 128 byte cacheline (assuming 64 bit words) */ NR_FREE_PAGES, NR_INACTIVE, NR_ACTIVE, We current have nr_active and nr_inactive reversed. [ "OK with patch, though using initializers canbe handy to prevent such things in future: static const char * const vmstat_text[] = { [NR_FREE_PAGES] = "nr_free_pages", ..." - Alexey ] Signed-off-by: Peter Zijlstra Acked-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 0da2f0f164f098bb4447c714b552ac1681b2d6e8 Author: Yoann Padioleau Date: Fri Jul 6 02:39:56 2007 -0700 potential compiler error, irqfunc caller sites update In 7d12e780e003f93433d49ce78cfedf4b4c52adc5 David Howells performed this evolution: "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers" He correctly updated many of the function definitions that were using this extra regs pointer parameter but forgot to update some caller sites of those functions. The reason the modifications was not properly done on all drivers is that some drivers were rarely compiled because they are for AMIGA, or that some code sites were inside #ifdefs where the option is not set or inside #if 0. Here is the semantic patch that found the occurences and fixed the problem. @ rule1 @ identifier fn; identifier irq, dev_id; typedef irqreturn_t; @@ static irqreturn_t fn(int irq, void *dev_id) { ... } @@ identifier rule1.fn; expression E1, E2, E3; @@ fn(E1, E2 - ,E3 ) Signed-off-by: Yoann Padioleau Cc: "David S. Miller" Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 071922c08cef62e194d83db1cc4fa75892c69651 Author: Vivek Goyal Date: Fri Jul 6 02:39:55 2007 -0700 i386: es7000 build breakage fix o Commit 1833d6bc72893265f22addd79cf52e6987496e0f broke the build if compiled with CONFIG_ES7000=y and CONFIG_X86_GENERICARCH=n arch/i386/kernel/built-in.o(.init.text+0x4fa9): In function `acpi_parse_madt': : undefined reference to `acpi_madt_oem_check' arch/i386/kernel/built-in.o(.init.text+0x7406): In function `smp_read_mpc': : undefined reference to `mps_oem_check' arch/i386/kernel/built-in.o(.init.text+0x8990): In function `connect_bsp_APIC': : undefined reference to `enable_apic_mode' make: *** [.tmp_vmlinux1] Error 1 o Fix the build issue. Provided the definitions of missing functions. o Don't have ES7000 machine. Only compile tested. Cc: Len Brown Cc: Natalie Protasevich Cc: Roland Dreier Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41a5311465b9de6d18e78b733a2c6e1b33e89be8 Author: Bjorn Helgaas Date: Fri Jul 6 02:39:54 2007 -0700 PNP SMCf010 quirk: work around Toshiba Portege 4000 ACPI issues When we enable the SMCf010 IR device, the Toshiba Portege 4000 BIOS claims the device is working, but it really isn't configured correctly. The BIOS *will* configure it, but only if we call _SRS after (1) reversing the order of the SIR and FIR I/O port regions and (2) changing the IRQ from active-high to active-low. This patch addresses the 2.6.22 regression: "no irda0 interface (2.6.21 was OK), smsc does not find chip" I tested this on a Portege 4000. The smsc-ircc2 driver correctly detects the device, and "irattach irda0 -s && irdadump" shows transmitted and received packets. Signed-off-by: Bjorn Helgaas Cc: Andrey Borzenkov Cc: Samuel Ortiz Cc: "Linus Walleij (LD/EAB)" Cc: Michal Piotrowski Cc: Adam Belay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d57d973101e87b2e30ccfa899fe36c4b2e32d217 Author: Alexander Graf Date: Fri Jul 6 02:39:53 2007 -0700 fix logic error in ipc compat semctl() When calling a semctl(IPC_STAT) without IPC_64 the check if the memory is unevaluated. This patch fixes this. Signed-off-by: Alexander Graf Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0db19c412ce260a293b06b4bab66550b84411bfc Author: David Woodhouse Date: Fri Jul 6 02:39:52 2007 -0700 x86_64: fix headers_install A bug in headers_install for ARCH=x86_64 yields an asm/ directory full of files all of which are using the same #ifdef guard, "__ASM_STUB_" with no postfix. So the second and later asm files #included in the same C file (often through standard headers like ioctl.h) yields no symbols. Strangeness with the Ubuntu 'tell me if I support something that's not explcitly mentioned in POSIX, and I'll strip it out' shell, I believe. We don't need the 'export' but we do need a semicolon at the end of the FNAME line: Signed-off-by: David Woodhouse Signed-off-by: Rob Landley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d25c1ba2fa1a9a1a4f68bef8edb0efefd79f0012 Author: Loic Prylli Date: Fri Jul 6 02:39:52 2007 -0700 MTRR: Fix race causing set_mtrr to go into infinite loop Processors synchronization in set_mtrr requires the .gate field to be set after .count field is properly initialized. Without an explicit barrier, the compiler was reordering those memory stores. That was sometimes causing a processor (in ipi_handler) to see the .gate change and decrement .count before the latter is set by set_mtrr() (which then hangs in a infinite loop with irqs disabled). Signed-off-by: Loic Prylli Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e2e99f0e4aa6363e8515ed17011c210c8f1b52a Author: Jason Wessel Date: Fri Jul 6 02:39:50 2007 -0700 i386: fix regression, endless loop in ptrace singlestep over an int80 The commit 635cf99a80f4ebee59d70eb64bb85ce829e4591f introduced a regression. Executing a ptrace single step after certain int80 accesses will infinitely loop and never advance the PC. The TIF_SINGLESTEP check should be done on the return from the syscall and not before it. I loops on each single step on the pop right after the int80 which writes out to the console. At that point you can issue as many single steps as you want and it will not advance any further. The test case is below: /* Test whether singlestep through an int80 syscall works. */ #define _GNU_SOURCE #include #include #include #include #include #include #include #include static int child, status; static struct user_regs_struct regs; static void do_child() { char str[80] = "child: int80 test\n"; ptrace(PTRACE_TRACEME, 0, 0, 0); kill(getpid(), SIGUSR1); write(fileno(stdout),str,strlen(str)); asm ("int $0x80" : : "a" (20)); /* getpid */ } static void do_parent() { unsigned long eip, expected = 0; again: waitpid(child, &status, 0); if (WIFEXITED(status) || WIFSIGNALED(status)) return; if (WIFSTOPPED(status)) { ptrace(PTRACE_GETREGS, child, 0, ®s); eip = regs.eip; if (expected) fprintf(stderr, "child stop @ %08lx, expected %08lx %s\n", eip, expected, eip == expected ? "" : " <== ERROR"); if (*(unsigned short *)eip == 0x80cd) { fprintf(stderr, "int 0x80 at %08x\n", (unsigned int)eip); expected = eip + 2; } else expected = 0; ptrace(PTRACE_SINGLESTEP, child, NULL, NULL); } goto again; } int main(int argc, char * const argv[]) { child = fork(); if (child) do_parent(); else do_child(); return 0; } Signed-off-by: Jason Wessel Cc: Jeremy Fitzhardinge Cc: Cc: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef7320edb1dd2cf6c969d1dcef4a9499a42f24da Author: Michael Ellerman Date: Fri Jul 6 02:39:49 2007 -0700 Fix elf_core_dump() when writing arch specific notes (spu coredumps) elf_core_dump() supports dumping arch specific ELF notes, via the #define ELF_CORE_WRITE_EXTRA_NOTES. Currently the only user of this is the powerpc spu coredump code. There is a bug in the handling of foffset WRT the arch notes, which causes us to erroneously increment foffset by the size of the arch notes, leaving a block of zeroes in the file, and causing all subsequent data in the file to be at + . eg: LOAD 0x050000 0x00100000 0x00000000 0x20000 0x20000 R E 0x10000 Tells us we should have a chunk of data at 0x50000. The truth is the data is at 0x90dbc = 0x50000 + 0x40dbc (the size of the arch notes). This bug prevents gdb from reading the core file correctly. The simplest fix is to simply remember the size of the arch notes, and add it to foffset after we've written the arch notes. The only drawback is that if the arch code doesn't write as many bytes as it said it would, we end up with a broken core dump again. For now I think that's a reasonable requirement. Tested on a Cell blade, gdb no longer complains about the core file being bogus. While I'm here I should point out that the spu coredump code does not work if we're dumping to a pipe - we'll have to wait for 23 to fix that. Signed-off-by: Michael Ellerman Acked-by: Arnd Bergmann Acked-by: Benjamin Herrenschmidt Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b3e975e4a06f1710693c5aa51b8f98facfa9863 Author: Ralf Baechle Date: Thu Jun 21 00:22:34 2007 +0100 [MIPS] Fix scheduling latency issue on 24K, 34K and 74K cores The idle loop goes to sleep using the WAIT instruction if !need_resched(). This has is suffering from from a race condition that if if just after need_resched has returned 0 an interrupt might set TIF_NEED_RESCHED but we've just completed the test so go to sleep anyway. This would be trivial to fix by just disabling interrupts during that sequence as in: local_irq_disable(); if (!need_resched()) __asm__("wait"); local_irq_enable(); but the processor architecture leaves it undefined if a processor calling WAIT with interrupts disabled will ever restart its pipeline and indeed some processors have made use of the freedom provided by the architecture definition. This has been resolved and the Config7.WII bit indicates that the use of WAIT is safe on 24K, 24KE and 34K cores. It also is safe on 74K starting revision 2.1.0 so enable the use of WAIT with interrupts disabled for 74K based on a c0_prid of at least that. Signed-off-by: Ralf Baechle commit fde97822a295da9dffa4af643b49a58ffc4516ad Author: Ralf Baechle Date: Fri Jul 6 14:40:05 2007 +0100 [MIPS] Add macros to encode processor revisions. Older processors used to encode processor version and revision in two 4-bit bitfields, the 4K seems to simply count up and even newer MTI cores have switched to use the 8-bits as 3:3:2 bitfield with the last field as the patch number. Signed-off-by: Ralf Baechle commit 075c733e19ce7530b53b78151cc4d303c8f64548 Author: Ralf Baechle Date: Thu Jul 5 08:14:21 2007 +0100 [MIPS] RM7000: Enable ICACHE_REFILLS_WORKAROUND_WAR. The RM7000 processors and the E9000 cores have a bug (though PMC-Sierra opposes it being called that) where invalid instructions in the same I-cache line worth of instructions being fetched may case spurious exceptions. The workaround for this was only enabled for E9000 cores; enable it also for all RM7000-based platforms. Signed-off-by: Ralf Baechle commit 9349075a15a876f8e82f433ec84f99d19d3e77f9 Author: Ralf Baechle Date: Thu Jul 5 17:39:48 2007 +0100 [MIPS] SMTC: Fix cut'n'paste bug in Kconfig.debug This effectivly turned the SMTC_IDLE_HOOK_DEBUG debug option into a no-op. Signed-off-by: Ralf Baechle commit f7c2778151f32581ea9ec567d01d5d85209fcfe6 Author: Ralf Baechle Date: Tue Jun 26 20:19:00 2007 +0200 [MIPS] Change libgcc-style functions from lib-y to obj-y Reported by Eugene Surovegin . If only modules were users of these functions they did not get linked into the kernel proper, so later module loads would fail as well. Signed-off-by: Ralf Baechle commit c3e838a2cbb0f14af4d718160933523ac4c37adf Author: Chris Dearman Date: Thu Jun 21 12:59:57 2007 +0100 [MIPS] Fix timer/performance interrupt detection Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 6fb88ce04f545ca7da15a7b447783bb7a4615511 Author: Ralf Baechle Date: Thu Jun 7 08:44:32 2007 +0100 [MIPS] AP/SP: Avoid triggering the 34K E125 performance issue C0_status doesn't need to be initialized at this point anyway; the register will be initialized later. Signed-off-by: Ralf Baechle commit 5a1970959053143f6674f6d98c259452763a2f22 Author: Andrew Sharp Date: Fri Mar 23 12:15:18 2007 -0700 [MIPS] 64-bit TO_PHYS_MASK macro for RM9000 processors Signed-off-by: Andrew Sharp Signed-off-by: Ralf Baechle commit 25442cafb8cc3d979418caccabc91260707a0947 Author: Jarek Poplawski Date: Thu Jul 5 17:42:44 2007 -0700 [NETPOLL]: Fixups for 'fix soft lockup when removing module' >From my recent patch: > > #1 > > Until kernel ver. 2.6.21 (including) cancel_rearming_delayed_work() > > required a work function should always (unconditionally) rearm with > > delay > 0 - otherwise it would endlessly loop. This patch replaces > > this function with cancel_delayed_work(). Later kernel versions don't > > require this, so here it's only for uniformity. But Oleg Nesterov found: > But 2.6.22 doesn't need this change, why it was merged? > > In fact, I suspect this change adds a race, ... His description was right (thanks), so this patch reverts #1. Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 94b83419e5b56a87410fd9c9939f0081fc155d65 Author: Adrian Bunk Date: Thu Jul 5 17:06:21 2007 -0700 [NET]: net/core/netevent.c should #include Every file should include the headers containing the prototypes for its global functions. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 25845b5155b55cd77e42655ec24161ba3feffa47 Author: Jing Min Zhao Date: Thu Jul 5 17:05:01 2007 -0700 [NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values Choices' index values may be out of range while still encoded in the fixed length bit-field. This bug may cause access to undefined types (NULL pointers) and thus crashes (Reported by Zhongling Wen). This patch also adds checking of decode flag when decoding SEQUENCEs. Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2cd052e44329dd2b42eb958f8f346b053de6e2cd Author: Johannes Berg Date: Thu Jul 5 17:03:09 2007 -0700 [NET] skbuff: remove export of static symbol skb_clone_fraglist is static so it shouldn't be exported. Signed-off-by: Johannes Berg Signed-off-by: David S. Miller commit 1669d857a25d62c6d0a6d9216e01c21287a7c844 Author: Vlad Yasevich Date: Tue Jul 3 14:29:23 2007 -0400 SCTP: Add scope_id validation for link-local binds SCTP currently permits users to bind to link-local addresses, but doesn't verify that the scope id specified at bind matches the interface that the address is configured on. It was report that this can hang a system. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit f50f95cab735ebe2993e8d1549f0615bad05f3f2 Author: Vlad Yasevich Date: Tue Jul 3 12:47:40 2007 -0400 SCTP: Check to make sure file is valid before setting timeout In-kernel sockets created with sock_create_kern don't usually have a file and file descriptor allocated to them. As a result, when SCTP tries to check the non-blocking flag, we Oops when dereferencing a NULL file pointer. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 3663c306609a9322a484fba28b3da66142c50ee9 Author: Vlad Yasevich Date: Tue Jul 3 12:43:12 2007 -0400 SCTP: Fix thinko in sctp_copy_laddrs() Correctly dereference bytes_copied in sctp_copy_laddrs(). I totally must have spaced when doing this. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 7e8767dddf3ad863a7013c334392e09177b48e2c Merge: cab8e5c... 082f47a... Author: Linus Torvalds Date: Thu Jul 5 16:10:16 2007 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] always allow dump_stack() to produce a backtrace [ARM] Fix non-page aligned boot time mappings [ARM] 4458/1: pxa: Fix CKEN usage and hence fix pxa suspend/resume [ARM] 4454/1: Use word accesses in Versatile PCI config reads commit cab8e5c4444cb7d9b8035de5d81fbfd5284a02fa Merge: 0dac723... 4e4eda8... Author: Linus Torvalds Date: Thu Jul 5 15:55:37 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: document some of keycodes Input: add a new EV_SW SW_RADIO event, for radio switches on laptops Input: serio - take drv_mutex in serio_cleanup() Input: atkbd - use printk_ratelimit for spurious ACK messages Input: atkbd - throttle LED switching Input: i8042 - add HP Pavilion ZT1000 to the MUX blacklist commit 0dac723e5c15ddb9bd26c1db21ee64ab71ae4925 Merge: 87a927c... 795bb15... Author: Linus Torvalds Date: Thu Jul 5 15:55:00 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] Update defconfigs [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver [POWERPC] Fix PMI breakage in cbe_cbufreq driver [POWERPC] Disable old EMAC driver in arch/powerpc commit 87a927c715789853cc8331d76039a2fd657a832a Author: David Woodhouse Date: Wed Jul 4 21:26:44 2007 -0400 Fix slab redzone alignment Commit b46b8f19c9cd435ecac4d9d12b39d78c137ecd66 fixed a couple of bugs by switching the redzone to 64 bits. Unfortunately, it neglected to ensure that the _second_ redzone, after the slab object, is aligned correctly. This caused illegal instruction faults on sparc32, which for some reason not entirely clear to me are not trapped and fixed up. Two things need to be done to fix this: - increase the object size, rounding up to alignof(long long) so that the second redzone can be aligned correctly. - If SLAB_STORE_USER is set but alignof(long long)==8, allow a full 64 bits of space for the user word at the end of the buffer, even though we may not _use_ the whole 64 bits. This patch should be a no-op on any 64-bit architecture or any 32-bit architecture where alignof(long long) == 4. Of the others, it's tested on ppc32 by myself and a very similar patch was tested on sparc32 by Mark Fortescue, who reported the new problem. Also, fix the conditions for FORCED_DEBUG, which hadn't been adjusted to the new sizes. Again noticed by Mark. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit 082f47a79bfc8a526b9a3e14a0ae9504fc09cc12 Author: Russell King Date: Thu Jul 5 19:59:51 2007 +0100 [ARM] always allow dump_stack() to produce a backtrace Don't make this dependent on CONFIG_DEBUG_KERNEL - if we hit a WARN_ON we need the stack trace to work out how we got to that point. Signed-off-by: Russell King commit 2bcb1b7de9eeea969a25d5f2b4511195cca9f2a2 Author: Linus Torvalds Date: Wed Jul 4 15:24:39 2007 -0700 Remove the blink driver Yeah, we could have just disabled it, but there's work on a new one that isn't as fundamentally broken, so there really doesn't seem to be any point in keeping it around. The recent timer cleanup broke the only valid use, and when I say "valid", I obviously mean "totally broken". So it's not like it works, or really even can work in the current format that uses the unsafe "panic" LED blinking routines.. Signed-off-by: Linus Torvalds commit 7b9c7b4d07fd8981193a2c4ecb650566f42d1219 Author: Russell King Date: Wed Jul 4 21:16:33 2007 +0100 [ARM] Fix non-page aligned boot time mappings AT91SAM9260 stopped booting with the recent changes to MM initialisation - it was asking for a non-aligned virtual address which caused loops to be non-terminal. Fix this by rounding virtual addresses down, but remember to include the offset in the length, and round the length up to the following page. This means that asking for a mapping of 4K starting at 2K into a page maps two pages as one would expect. Signed-off-by: Russell King commit 190045d53b9a8341e8600d6eb468b6081e903afb Merge: e2baf4e... 8c976e3... Author: Linus Torvalds Date: Wed Jul 4 09:26:44 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] VSMP: Fix initialization ordering bug. [MIPS] Add whitelists for checksyscalls.sh [MIPS] die(): Properly declare as non-returning [MIPS] Fix include wrapper symbol definitions in IP32 code. commit 8c976e34516c9e134488babbb95af182340370c8 Author: Ralf Baechle Date: Tue Jul 3 18:25:58 2007 +0200 [MIPS] VSMP: Fix initialization ordering bug. Signed-off-by: Ralf Baechle commit 83d0f2332edb3001617e6a292c4412ae5f2bf659 Author: Atsushi Nemoto Date: Tue May 29 23:30:04 2007 +0900 [MIPS] Add whitelists for checksyscalls.sh Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit eaf2b8dca47cc1d4ca7fd83f37604e0f5478b33a Author: Maciej W. Rozycki Date: Tue May 29 15:03:56 2007 +0100 [MIPS] die(): Properly declare as non-returning This marks the declaration of die() correctly, removing "control reaches end of non-void function" warnings from non-void functions that die() at the end. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit ab012ebf9ebb5f3392e74c1666e7473b8567aeb0 Author: Kumba Date: Fri May 25 02:26:47 2007 -0400 [MIPS] Fix include wrapper symbol definitions in IP32 code. Some IP35 defines snuck into some IP32-specific code during the DMA re-write. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit e2baf4ed168589af8224d51f0ac50e65bcdee3f6 Author: David Woodhouse Date: Tue Jul 3 16:51:19 2007 -0400 [JFFS2] Fix readinode failure when read_dnode() detects CRC failure. We should have stopped returning 1 from read_dnode() to indicate failure. We can just mark the damn thing obsolete immediately. But I missed a case where we don't. Signed-off-by: David Woodhouse commit ba609a9d97ba231c3d94443c50579ceb5fc33867 Author: Linus Torvalds Date: Tue Jul 3 18:27:53 2007 -0700 Remove some unused variables When Andi reverted the HPET resource reservation (in commit 0f8dc2f06560e2ca126d1670a24126ba08357d38), he didn't remove the now unused variables, which just causes gcc to be noisy. Signed-off-by: Linus Torvalds commit fcb82f8835c1d71b4fe5de1d9894f45370f80dab Author: Zach Brown Date: Tue Jul 3 15:28:55 2007 -0700 dio: remove bogus refcounting BUG_ON Badari Pulavarty reported a case of this BUG_ON is triggering during testing. It's completely bogus and should be removed. It's trying to notice if we left references to the dio hanging around in the sync case. They should have been dropped as IO completed while this path was in dio_await_completion(). This condition will also be checked, via some twisty logic, by the BUG_ON(ret != -EIOCBQUEUED) a few lines lower. So to start this BUG_ON() is redundant. More fatally, it's dereferencing dio-> after having dropped its reference. It's only safe to dereference the dio after releasing the lock if the final reference was just dropped. Another CPU might free the dio in bio completion and reuse the memory after this path drops the dio lock but before the BUG_ON() is evaluated. This patch passed aio+dio regression unit tests and aio-stress on ext3. Signed-off-by: Zach Brown Cc: Badari Pulavarty Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 5dcccd8d7eae870d85c3f175fd0823d3da07d0e3 Author: Andi Kleen Date: Wed Jul 4 01:38:13 2007 +0200 Revert perfctr reservation to 2.6.21 state With this change it works again when the nmi watchdog is disabled. Signed-off-by: Andi Kleen Cc: Björn Steinbrink Cc: Stephane Eranian Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 0f8dc2f06560e2ca126d1670a24126ba08357d38 Author: Andi Kleen Date: Fri Jun 29 16:16:36 2007 +0200 Revert HPET resource reservation Matthias Lenk reports that the PCI subsystem would move the HPET on SB400/SB600-based systems, where the HPET is in BAR1 of the SMbus controller. The reason? The ACPI layer registered the PCI MMIO range as being busy too early, before PCI enumeration had happened, causing the PCI layer to decide that it should relocate the resources somewhere else. Firmware resources should be marked busy _after_ the PCI enumeration and probing has happened, not before. Remove the too-early reservation, we'll fix it up to do it properly later. In the meantime, this solves the regression. Tested-by: Matthias Lenk Cc: Aaron Durbin Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 9d7542f891f22d16ea1465d19d253888e87f7ad6 Merge: f744a05... d61bcce... Author: Linus Torvalds Date: Tue Jul 3 13:58:49 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: ide: ide_scan_pcibus(): check __pci_register_driver return value ide: pdc202xx_new PLL input clock fix it821x: fix incorrect SWDMA mask amd74xx: resume fix hpt366: use correct enablebits for HPT36x hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66 ide: Fix a theoretical Ooops case ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy commit f744a0547ac5055a3e9eb20bfe7ff29077a32c16 Merge: dbc55fa... 1fb4a17... Author: Linus Torvalds Date: Tue Jul 3 13:58:03 2007 -0700 Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5822): Fix the return value in ttpci_budget_init() V4L/DVB (5818): CinergyT2: fix flush_workqueue() vs work->func() deadlock V4L/DVB (5816): Cx88-blackbird: fix vidioc_g_tuner never ending list of tuners V4L/DVB (5808): Bttv: fix v4l1 breaking the driver commit dbc55faa64c12f4c9fab6e2bd131d771bc026ed1 Author: Christoph Lameter Date: Tue Jul 3 09:31:04 2007 -0700 SLUB: Make lockdep happy by not calling add_partial with interrupts enabled during bootstrap If we move the local_irq_enable() to the end of the function then add_partial() in early_kmem_cache_node_alloc() will be called with interrupts disabled like during regular operations. This makes lockdep happy. Signed-off-by: Christoph Lameter Tested-by: Andre Noll Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 746976a301ac9c9aa10d7d42454f8d6cdad8ff2b Author: Thomas Gleixner Date: Tue Jul 3 20:05:20 2007 +0200 NTP: remove clock_was_set() call to prevent deadlock The clock_was_set() call in seconds_overflow() which happens only when leap seconds are inserted / deleted is wrong in two aspects: 1. it results in a call to on_each_cpu() with interrupts disabled 2. it is potential deadlock source vs. call_lock in smp_call_function() The only possible side effect of the removal might be, that an absolute CLOCK_REALTIME timer fires 1 second too late, in the rare case of leap second deletion and an absolute CLOCK_REALTIME timer which expires in the affected time frame. It will never fire too early. This was probably observed by the reporter of a June 30th -> July 1st hang: http://lkml.org/lkml/2007/7/3/103 A similar problem was observed by Dave Jones, who provided a screen shot with a lockdep back trace, which allowed to analyse the problem. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit d61bcce9c1aa2c9f8a768d73c4c517f81d226725 Author: Andrew Morton Date: Tue Jul 3 22:28:36 2007 +0200 ide: ide_scan_pcibus(): check __pci_register_driver return value drivers/ide/setup-pci.c: In function 'ide_scan_pcibus': drivers/ide/setup-pci.c:879: warning: ignoring return value of '__pci_register_driver', declared with attribute warn_unused_result Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 8006bf56e360a4db71d304df778870a371a9e930 Author: Albert Lee Date: Tue Jul 3 22:28:36 2007 +0200 ide: pdc202xx_new PLL input clock fix Recently the PLL input clock of Promise 2027x is sometimes detected higher than expected (e.g. 20.027 MHz compared to 16.714 MHz). It seems sometimes the mdelay() function is not as precise as it used to be. Per Alan's advice, HT or power management might affect the precision of mdelay(). This patch calls gettimeofday() to measure the time elapsed and calculate the PLL input clock accordingly. Signed-off-by: Albert Lee Cc: Alan Cox Cc: Bahadir Balban Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 52374f890c1d0d64148d55a20d995a0b3e0ae987 Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 3 22:28:35 2007 +0200 it821x: fix incorrect SWDMA mask SWDMA modes are unsupported by it821x. Attempts to tune SWDMA modes always fail (due to sanity check in ->speedproc) and result in PIO being tuned. * Fix incorrect SWDMA mask so core code won't try these modes and will just tune PIO if no other DMA modes are available. * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov commit 603a0e2c0a160ad8c2d00d71a700bb95482be5de Author: Bartlomiej Zolnierkiewicz Date: Tue Jul 3 22:28:35 2007 +0200 amd74xx: resume fix * Driver can't skip programming transfer mode on the device in amd_set_drive() (similar fix has been applied to via82cxxx driver ages ago). * While at it remove redundant warning (ide_config_drive_speed() already produces more valuable one). * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz commit 96dcc08b0c6b730474469b10ed5eeda06e617deb Author: Sergei Shtylyov Date: Tue Jul 3 22:28:35 2007 +0200 hpt366: use correct enablebits for HPT36x The HPT36x chips finally turned out to have the channel enable bits -- however, badly implemented. Make use of them despite it's probably only going to burden the driver's code -- assuming both channels are always enabled by the HighPoint BIOS anyway... Signed-off-by: Sergei Shtylyov Acked-by: Linas Vepstas Cc: michal.kepien@poczta.onet.pl Signed-off-by: Bartlomiej Zolnierkiewicz commit 783353b1d3d1ed3ae4a0bd4ea4557bd4d77aa04e Author: Sergei Shtylyov Date: Tue Jul 3 22:28:35 2007 +0200 hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66 Add the MAXTOR STM3320620A drive into the UltraDMA/66 mode blacklist for the HPT36x chips. Signed-off-by: Sergei Shtylyov Acked-by: Linas Vepstas Signed-off-by: Bartlomiej Zolnierkiewicz commit 785955752fde4c555a1d9f74ddfe1f7aca3e0c7f Author: Alan Cox Date: Tue Jul 3 22:28:35 2007 +0200 ide: Fix a theoretical Ooops case Found by a static analyser. It is in theory possible we dereference dev->id when it has become invalid. Re-order to avoid this. Not needed for new-ide as we no longer support the crazy exabyte nest stuff Signed-off-by: Alan Cox Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit b42fa133110fa952299fa76cbe91226c14838261 Author: Masatake YAMATO Date: Tue Jul 3 22:28:34 2007 +0200 ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy Look at wait_drive_not_busy in drivers/ide/ide-taskfile.c: static u8 wait_drive_not_busy(ide_drive_t *drive) { ide_hwif_t *hwif = HWIF(drive); int retries = 100; u8 stat; /* * Last sector was transfered, wait until drive is ready. * This can take up to 10 usec, but we will wait max 1 ms * (drive_cmd_intr() waits that long). */ while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--) udelay(10); if (!retries) printk(KERN_ERR "%s: drive still BUSY!\n", drive->name); return stat; } `printk' is never called because `retries' never holds zero at the outside of `while' loop: when `retries' holds zero at the while's loop condition, `retries' will hold -1 at the if condition. Signed-off-by: Masatake YAMATO Cc: Chuck Ebbert Cc: joe@perches.com Signed-off-by: Bartlomiej Zolnierkiewicz commit 1fb4a17f6e47d86b25bfc4fd9df4301bca09c999 Author: Hartmut Birr Date: Mon Jul 2 13:39:41 2007 -0300 V4L/DVB (5822): Fix the return value in ttpci_budget_init() if the call to budget_register() fails in ttpci_budget_int(), ttpci_budget_init() returns success. The attached patch will fix this problem. Signed-off-by: Hartmut Birr Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1e4597e8f0049dccedb0e011934007309fa2aeab Author: Oleg Nesterov Date: Mon Jul 2 12:26:20 2007 -0300 V4L/DVB (5818): CinergyT2: fix flush_workqueue() vs work->func() deadlock Spotted and tested by Thomas Sattler . cinergyT2.c does cancel_delayed_work() + flush_scheduled_work() while holding cinergyt2->sem. This leads to deadlock because work->func() needs the same mutex to complete. Another bug is that this code in fact can't reliably stop the re-arming delayed_work. Convert this code to use cancel_rearming_delayed_work() and move it out of ->sem. Another mutex, ->wq_sem, was added to protect against the concurrent open/resume. This patch is a horrible hack to fix the lockup which happens in practice. As Dmitry Torokhov pointed out this driver has other problems and needs further changes. Signed-off-by: Oleg Nesterov Signed-off-by: Mauro Carvalho Chehab commit f057131fb6eb2c45f6023e3da41ccd6e4e71aee9 Author: Jelle Foks Date: Mon May 21 14:56:17 2007 -0300 V4L/DVB (5816): Cx88-blackbird: fix vidioc_g_tuner never ending list of tuners v4l-info and other programs would loop indefinitely while querying the tuners for cx88-blackbird cards. The cause was that vidioc_g_tuner didn't return an error value for qctrl->id != 0, making the application think there is a never ending list of tuners... This patch adds the same index check as done in vidioc_g_tuner() in cx88-video. Signed-off-by: Jelle Foks Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 333408f21590d50397f3004e3f87070fa8f52c51 Author: Trent Piepho Date: Tue Jul 3 15:08:10 2007 -0300 V4L/DVB (5808): Bttv: fix v4l1 breaking the driver If one uses a V4L *one* application, such as vlc or mplayer's v4l driver, as the first user after the driver is loaded, the driver wedges itself and will never capture properly. Even if one uses a V4L2 application later, it still won't work. If one uses a V4L *two* application first, such as tvtime or mplayer's v4l2 driver, then the driver will be ok. One can then run a V4L1 application, and it will work. It turns out the problem is with norm changing and the crop support that was added in 2.6.21. The driver defaults to PAL, and keeps the last norm it was set too across opens. If one changes the norm via V4L1, the cropping parameters are not reset like they should be, and they'll remain broken across device opens. This patch removes the direct setting of btv->tvnorm in the V4L1 ioctl VIDIOCSCHAN handler. The norm is set via the existing call to set_input(), which calls set_tvnorm(), which will reset the cropping values now that it is able to detect the norm change. Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 872aad45d6174570dd2e1defc3efee50f2cfcc72 Author: Alan Cox Date: Tue Jul 3 15:14:05 2007 +0100 pata_pcmcia: Switch to ata_sff_port_start PCMCIA doesn't use DMA and as this driver is used on many platforms we don't want it to fail on those that define the DMA alloc API as a NULL return Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit a0ac38f16045f90dbbcd265b638cd7254c53aa65 Author: Alan Cox Date: Tue Jul 3 15:15:13 2007 +0100 pata_pdc202xx_old: Correct cable detect logic We got it backwards and now the other detects are fixed it shows up Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit d6f4d5eafdd0bbdaa166a0650d27045c26ca63dd Author: Alan Cox Date: Tue Jul 3 15:11:30 2007 +0100 ata_generic: Check the right register for the DMA enabled flags Mirrors change in IT821X Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit ee5815023527dd579ada340786e329ff6c5c0eea Author: Chuck Ebbert Date: Mon Jun 25 19:13:32 2007 -0400 pata_ali: fix UDMA settings This patch was found to fix some of the problems with the pata_ali driver. https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=156482 Signed-off-by: Jeff Garzik commit d9f9c6bc91c14f53ffa782ffcd42259ecae1d38c Author: Florian Attenberger Date: Mon Jul 2 17:09:29 2007 +0200 sata_mv: PCI-ID for Adaptec 1430SA SATA Controller Signed-off-by: Florian Attenberger Signed-off-by: Jeff Garzik commit 4031826b3ca40982880f6b9f2282c7d7fad60d77 Author: Tejun Heo Date: Tue Jul 3 01:38:47 2007 +0900 libata: fix assigned IRQ reporting host->irq and host->irq2 should be set before ata_host_register() for IRQ reporting to work. Move up host->irq assignment in ata_host_activate() and add it to ata_pci_init_one() native path and pata_cs5520. The port info printing in ata_host_register() doesn't fit all the different controllers. It should probably be moved out to LLDs with some helpers in the future. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit aa2e09da2a332e748532aa2a71b090e7e7c3203d Author: Len Brown Date: Mon Jul 2 23:57:45 2007 -0400 ACPI: fix acpi_osi=!Linux Need to check for special case "acpi_osi=!Linux" before handling the general case "acpi_osi=!*", or it will have no effect. Signed-off-by: Len Brown Signed-off-by: Linus Torvalds commit 52c4d73a6cca0db2927b60935e57429f98eae7c1 Merge: ca9c5ff... 841adfc... Author: Linus Torvalds Date: Mon Jul 2 21:05:35 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB/cm: Partial error clean up unmaps wrong address mlx4_core: Add new Mellanox device IDs commit ca9c5ffd9d12e136f72fa52840cda83485d586cd Merge: c1fa238... 7718457... Author: Linus Torvalds Date: Mon Jul 2 21:05:14 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: remove zero-sized include/asm-blackfin/macros.h Blackfin arch: update board defconfig files Blackfin arch: Fix up remaining printks with proper log levels Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration commit c1fa238762ad2518ab6003983c16508470be6d81 Merge: b59449b... 531e3a6... Author: Linus Torvalds Date: Mon Jul 2 21:04:36 2007 -0700 Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] sata_nv: undo merge error commit b59449bea276793b8f228ea07bcb861670d79d75 Merge: fffe566... 63ac9b9... Author: Linus Torvalds Date: Mon Jul 2 21:01:38 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: 3c589_cs: fix local_bh_enable warning RESEND [PATCH 3/3] NetXen: Graceful teardown of interface and hardware upon module unload drivers/net/ns83820.c: fix a check-after-use net/usb/cdc_ether minor sparse cleanup RESEND [PATCH 2/3] NetXen: Support per PCI-function interrupt mask registers RESEND [PATCH 1/3] NetXen: Fix issue of MSI not working correctly dm9601: Return 0 from bind() on success Update MAINTAINERS for USB network devices usbnet: Zero padding byte if there is tail room in skb dm9601: HW header size shouldn't be included in packet length starfire list alpha as 64 bit arch myri10ge: SET_NETDEV_DEV() gianfar: Fix typo bug introduced by move to udp_hdr() [PATCH] libertas: remove private ioctls [PATCH] libertas: fix WPA associations by handling ENABLE_RSN correctly [PATCH] libertas: kill wlan_scan_process_results [PATCH] libertas: style fixes commit fffe566b8f735fa71b38c7cc487b471b85894401 Merge: dcf87a2... a3cabb2... Author: Linus Torvalds Date: Mon Jul 2 21:01:13 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: libata: PATA-mode fixes for sis_sata libata: add HTS541616J9SA00 to NCQ blacklist sata_nv: allow changing queue depth sata_inic162x: disable LBA48 devices libata: remove reading alt_status from ata_hsm_qc_complete() libata: pata_pdc2027x PLL input clock fix scsi disk help file is not complete commit dcf87a2e357e277d3f3e3661962703b80113d2f8 Merge: a38d618... fe77d4f... Author: Linus Torvalds Date: Mon Jul 2 20:59:54 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: add Kconfig help on building both stacks firewire: fix async reception on big endian machines commit 841adfca9c5fc0fec6b1f0b2e5eb7a3b239a7730 Author: Ralph Campbell Date: Fri Jun 29 11:37:56 2007 -0700 IPoIB/cm: Partial error clean up unmaps wrong address If a page can't be allocated for the frag list of a skb, the code to unmap the partially allocated list is off by one. For exaple, if 'frags' equals one, i == 0, and the alloc_page() fails, then the old loop would have unmapped mapping[1] which is uninitialized. The same would happen if the call to ib_dma_map_page() failed. Signed-off-by: Ralph Campbell Acked-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 786f238e4f2f0d962831ee3228f2327133eb082a Author: Jack Morgenstein Date: Mon Jul 2 17:36:18 2007 +0300 mlx4_core: Add new Mellanox device IDs Add new IDs for PCIe gen2 devices. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 7718457dc8fd98a9f61a5e42653161bac3904a65 Author: Marco Roeland Date: Tue Jul 3 08:25:50 2007 +0800 Blackfin arch: remove zero-sized include/asm-blackfin/macros.h This file accidentally got truncated instead of deleted in commit df30b11. Signed-off-by: Marco Roeland Cc: Robert P. J. Day Cc: Jeff Garzik Cc: Jesper Juhl Cc: Alex Riesen Cc: Robin Getz Acked-by: Bryan Wu commit 531e3a61f55261bf466d0415c48999511334933c Author: Jeff Garzik Date: Mon Jul 2 18:12:19 2007 -0400 [libata] sata_nv: undo merge error Only the ADMA entry was supposed to be able to change queue depth. Signed-off-by: Jeff Garzik commit 63ac9b915924d1237d2135fcb4de724e6127ca5e Author: Patrick McHardy Date: Mon Jul 2 16:08:28 2007 +0200 3c589_cs: fix local_bh_enable warning Russell King wrote: > Having upgraded from 2.6.16 to 2.6.22-rc6, I'm now seeing the following. > > Looks like netfilter is calling local_bh_enable() with IRQs disabled, > which would appear to be illegal. Thankfully, this is a warn-once > warning. > > WARNING: at /home/rmk/git/linux-2.6-rmk/kernel/softirq.c:138 local_bh_enable() > [...] > [] (nf_conntrack_destroy+0x0/0x2c) from [] (__kfree_skb+0xd0/0x100) > [] (__kfree_skb+0x0/0x100) from [] (kfree_skb+0x4c/0x50) > r5:c12a3800 r4:00000300 > [] (kfree_skb+0x0/0x50) from [] (el3_start_xmit+0xb8/0xd0 [3c589_cs]) > [] (el3_start_xmit+0x0/0xd0 [3c589_cs]) from [] (dev_hard_start_xmit+0x1a8/0x244) > r7:c12a3800 r6:c1a9aa00 r5:c1a9aa00 r4:c12a3800 > [] (dev_hard_start_xmit+0x0/0x244) from [] (__qdisc_run+0xb0/0x198) Thats a bug in the 3c589_cs driver. Patch attached. Signed-off-by: Patrick McHardy Signed-off-by: Jeff Garzik commit a3cabb271ea66739704497102536fb01bb72fe37 Author: Uwe Koziolek Date: Thu Jun 14 23:40:43 2007 +0200 libata: PATA-mode fixes for sis_sata Changed PATA handler for PATA-ports used by sata_sis. This patch was originally submitted by Jeff Garzik. Added PCI-ID 1180 for SiS966 Controller in pata_sis. The 1180 mode is fully compatible to other SiS PATA-controller. The PCI-ID 1183 is SATA in PATA-emulation, but not fully compatible to SiS5513/5518. sata_sis.c is forwarding this ID to pata_sis. 1183 is not working if simply added to pata_sis. This handling fixes issues with SiS968. Signed-off-by: Uwe Koziolek Signed-off-by: Jeff Garzik commit e14cbfa630cd3ab2631ee21b718b290928f47868 Author: Tejun Heo Date: Mon Jun 25 11:28:59 2007 +0900 libata: add HTS541616J9SA00 to NCQ blacklist Another member of HTS5416* family doing spurious NCQ completion. Signed-off-by: Tejun Heo Cc: Enrico Sardi Signed-off-by: Jeff Garzik commit 1e0b5ab81e2abb8bbf7446f4a17f43a1e34944fe Author: Robert Hancock Date: Thu Jun 28 18:52:24 2007 -0600 sata_nv: allow changing queue depth The sata_nv driver was missing the change_queue_depth hook in the SCSI host template which the other NCQ-capable libata drivers had. This made it impossible to change the queue depth by user request. Add this in. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 90c937853d792ea997d7fdec72dbbea4f92e12c4 Author: Tejun Heo Date: Fri Jun 29 11:33:08 2007 +0900 sata_inic162x: disable LBA48 devices sata_inic162x can't do LBA48 properly yet and is likely to corrupt data on drives larger than LBA28 limit. Disable LBA48 devices during device configuration. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 74cdbba42dd515887ef3fc0ab498e70bd086c075 Author: Albert Lee Date: Thu Jun 28 10:05:31 2007 +0800 libata: remove reading alt_status from ata_hsm_qc_complete() In ata_hsm_qc_complete(): Calling ata_altstatus() after the qc is completed might race with next qc. Remove it. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 8c781bf77a339748839bfd5eedfe2ad3e0e05c4a Author: Albert Lee Date: Tue Jun 26 13:43:15 2007 +0800 libata: pata_pdc2027x PLL input clock fix Recently the PLL input clock of pata_pdc2027x is sometimes detected higer than expected (e.g. 20.027 MHz compared to 16.714 MHz). It seems sometimes the mdelay() function is not as precise as it used to be. Per Alan's advice, HT or power management might affect the precision of mdelay(). This patch calls gettimeofday() to mesure the time elapsed and calculate the PLL input clock accordingly. Signed-off-by: Albert Lee Cc: Alan Cox Signed-off-by: Jeff Garzik commit abcdceb9d0bf39da7c7ff8bcdff6eb4d9dfec56f Author: Randy Dunlap Date: Mon Jun 11 11:59:34 2007 -0700 scsi disk help file is not complete On Mon, 11 Jun 2007 20:28:16 +0200 api wrote: > Good day, > When doing make menuconfig one comes across CONFIG_BLK_DEV_SD. > The help file states that this is for scsi disks.NO MENTION IS MADE THAT > IT IS NEEDE FOR SATA DISKS AS WELL! > Would have saved me a lot of time if the help was up to date. > I hope this can be changed so others can make a kernel for sata systems > quicker. From: Randy Dunlap Add help info for BLK_DEV_SD referring to its use in SATA or PATA driver configurations. Add help text for "ATA" indicating that it probably needs some SCSI config symbols enabled in order to be useful. Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 1f750a782c0e9593a8d0981ea972f22334980955 Author: Richard Purdie Date: Mon Jul 2 10:19:07 2007 +0100 [ARM] 4458/1: pxa: Fix CKEN usage and hence fix pxa suspend/resume The PXA CKEN changes broken syspend/resume on the pxa27x. This patch corrects the problem and fixes another couple of bad references. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 756813cac1d0172e1f93d977fe8bd1cd5086be21 Author: Andrzej Zaborowski Date: Tue Jun 26 14:31:23 2007 +0100 [ARM] 4454/1: Use word accesses in Versatile PCI config reads ARM Versatile PCI config reads of one byte width have the lowest two bits of the address cleared and result in reading from a wrong place in the config space. This change is to use word size accesses like it is done for halfword reads. Byte reads are used for retrieving the IRQ number of a PCI device and the problem was not exposed until 2.6.20 because the value read was discarded in drivers/pci/setup-irq.c (recently fixed). Signed-off-by: Andrzej Zaborowski Acked-by: Paul Brook Signed-off-by: Russell King commit 96acb6eb8effe7c2549909e2ee49f4130f2c167d Author: Dhananjay Phadke Date: Mon Jul 2 09:37:57 2007 +0530 RESEND [PATCH 3/3] NetXen: Graceful teardown of interface and hardware upon module unload Resending patch 3/3 only. These changes allow driver close routine to be called during module unload, to clean-up buffers and other software resources, flush queues etc. Also, hardware is reset to pristine state. Signed-off-by: Dhananjay Phadke Signed-off-by: Milan Bag Signed-off-by: Wen Xiong Signed-off-by: Jeff Garzik commit d14e37e12087e98b63907518dff83a90297605d6 Author: Adrian Bunk Date: Sun Jul 1 22:21:10 2007 +0200 drivers/net/ns83820.c: fix a check-after-use This patch fixes a check-after-use spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit afaee82c0aef7c2b30acff129c723031343e10c2 Author: David Brownell Date: Sun Jul 1 11:47:59 2007 -0700 net/usb/cdc_ether minor sparse cleanup Remove an "sparse" warning about a shadowed variable name. Signed-off-by: David Brownell Signed-off-by: Jeff Garzik commit 2d1a3bbdf21d05e16703c8d608628ae4676eb3ac Author: dhananjay.phadke@gmail.com Date: Mon Jul 2 00:26:00 2007 +0530 RESEND [PATCH 2/3] NetXen: Support per PCI-function interrupt mask registers This patch updates the various access routines to access different control and status settings present in different register locations. This will fix problems related to working of different ports in multi Port card. Signed-off by: Dhananjay Phadke Signed-off by: Milan Bag Signed-off-by: Jeff Garzik commit 644caeefb3bbf539e74b7098648ff0bfc9e52bb3 Author: dhananjay.phadke@gmail.com Date: Mon Jul 2 00:25:59 2007 +0530 RESEND [PATCH 1/3] NetXen: Fix issue of MSI not working correctly NetXen driver uses PCI function 0 to provide the functionality of MSI. The patch makes driver check the bus master bit for function 0 and enable it after the card initialization. Signed-off-by: Dhananjay Phadke Signed-off-by: Milan Bag Signed-off-by: Wen Xiong Signed-off-by: Jeff Garzik commit b8f59586cecdb612cd31f4d9e7904f46277ddd64 Author: Peter Korsgaard Date: Sat Jun 30 23:07:42 2007 +0200 dm9601: Return 0 from bind() on success Fixup dm9601_bind() so it returns 0 on success rather than just a positive number, as otherwise usbnet doesn't init the status handler. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 043600a62a45b2d5cac262fca9012fc24db19964 Author: Peter Korsgaard Date: Wed Jun 27 21:18:18 2007 +0200 Update MAINTAINERS for USB network devices >>>>> "Greg" == Greg KH writes: Greg> Yeah, this is the cdc_acm driver that is still in the USB drivers/ Greg> directory tree as it is a USB class driver that shows up as a tty device Greg> to userspace. It should not be moved to the networking list unless no Greg> one minds that I never see any queries about it :) Ok, here's an updated patch: Questions regarding the USB network drivers should now go to netdev. Signed-off-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Jeff Garzik commit 3e323f3e86196eec18d6959585aa3188d060c43b Author: Peter Korsgaard Date: Wed Jun 27 08:48:15 2007 +0200 usbnet: Zero padding byte if there is tail room in skb Usbnet adds a padding byte if a 0 byte USB packet would be sent. Zero padding byte if there is tail room in skb. Signed-of-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Jeff Garzik commit 23de559b8d3537f972f325e7e015c18aa2e4d987 Author: Peter Korsgaard Date: Wed Jun 27 08:14:50 2007 +0200 dm9601: HW header size shouldn't be included in packet length The dm9601 driver was including the 2 byte hardware header in the packet length, causing the HW to send 2 extra bytes of garbage on tx. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 983b7dc07f083d7d78f408a6f841b399b954767d Author: maximilian attems Date: Sun Jun 24 23:36:45 2007 +0200 starfire list alpha as 64 bit arch instead of: "This driver has not been ported to this 64-bit architecture yet." the driver is said to work on alpha, see http://bugs.debian.org/305330 Signed-off-by: maximilian attems Signed-off-by: Jeff Garzik commit b245fb675bf03d716b84dcb40885aeb50041dcca Author: Maik Hampel Date: Thu Jun 28 17:07:26 2007 +0200 myri10ge: SET_NETDEV_DEV() SET_NETDEV_DEV() in myri10ge to create the "/sys/class/net//device" symlink. Signed-off-by: Maik Hampel Signed-off-by: Jeff Garzik commit c529e632a286cd9e493398fa73e0aa1fc5a45ce5 Merge: 36f9d0c... 8da32de... Author: Jeff Garzik Date: Mon Jul 2 08:15:33 2007 -0400 Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream-fixes commit 36f9d0c5e9dc650de26b112079f46e6160a881a0 Merge: a38d618... 7dcf528... Author: Jeff Garzik Date: Mon Jul 2 08:14:30 2007 -0400 Merge branch 'libertas-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 4a3207a3339955047aab1fd5d808f8050d50dd85 Author: Mike Frysinger Date: Mon Jul 2 13:49:15 2007 +0800 Blackfin arch: update board defconfig files Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 795bb15e0735bd2b0015ca333fa157399b72c168 Author: Kumar Gala Date: Mon Jul 2 00:04:36 2007 -0500 [POWERPC] Update defconfigs Signed-off-by: Kumar Gala commit 9f7905812e5919862acb6ede63e10d3d1bb4958e Author: Olof Johansson Date: Mon Jun 4 14:47:04 2007 +1000 [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver Uninline virq_to_hw and export it so modules can use it. The alternative would be to export the irq_map array instead, but it's an infrequently called function, and keeping the array unexported seems considerably cleaner. This is needed so that the pasemi_mac driver can be compiled as a module. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit ee5d1b7f2a01ce4d95ca247b5a499b72f31cdbe8 Author: Christian Krafft Date: Thu Jun 28 21:14:38 2007 +1000 [POWERPC] Fix PMI breakage in cbe_cbufreq driver The recent change to cell_defconfig to enable cpufreq on Cell exposed the fact that the cbe_cpufreq driver currently needs the PMI interface code to compile, but Kconfig doesn't make sure that the PMI interface code gets built if cbe_cpufreq is enabled. In fact cbe_cpufreq can work without PMI, so this ifdefs out the code that deals with PMI. This is a minimal solution for 2.6.22; a more comprehensive solution will be merged for 2.6.23. Signed-off-by: Christian Krafft Signed-off-by: Paul Mackerras commit 86affd5a00a92e491e5f00ed659492767519fdf7 Author: David Gibson Date: Thu Jun 28 11:27:57 2007 +1000 [POWERPC] Disable old EMAC driver in arch/powerpc The EMAC driver, in drivers/net/ibm_emac, for the embedded Ethernet MAC found in PowerPC 4xx embedded chips is not suitable for arch/powerpc. It will not build because it relies on the old arch/ppc OCP mechanism. BenH has a new, device-tree aware version of the driver which will work in arch/powerpc, but until it's merged, this patch will disable the old, non-building version. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit fe77d4f283e840879f0e23b86a5d6a486823fdef Author: Stefan Richter Date: Mon Jun 25 22:18:40 2007 +0200 firewire: add Kconfig help on building both stacks Alas that won't work so good, because nobody reads help texts. I thought about adding some crude multiple choice selection (build the old stack, build the new stack, build both stacks). It's possible, but it would introduce awkward dummy config variables. Signed-off-by: Stefan Richter commit 0a9972baa7454c747fd5f67ce864420dff99d383 Author: Stefan Richter Date: Sat Jun 23 20:28:17 2007 +0200 firewire: fix async reception on big endian machines descriptor.data_address is little endian Tested-by: Olaf Hering Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 8da32de5c845b711a500f89342baf10c662e2ecb Author: Kumar Gala Date: Fri Jun 29 00:12:04 2007 -0500 gianfar: Fix typo bug introduced by move to udp_hdr() In commit 4bedb45203eab92a87b4c863fe2d0cded633427f both the udp and tcp cases where changed to use udp_hdr() instead of leaving the tcp case alone and fixing with tcp_hdr(). This ended up causing random behavior with TCP connections because of looking for tcp_hdr()->check in the wrong place. Signed-off-by: Kumar Gala commit 4e4eda866ec7bd7a151e4884a291221eb74644ae Author: Dmitry Torokhov Date: Fri Jun 29 01:10:54 2007 -0400 Input: document some of keycodes Document some of keycodes, based on USB HUT 1.12 and current mapping in HID driver. Signed-off-by: Dmitry Torokhov commit c77da1780325d889cac98e8179449ddf54e71ce0 Author: Henrique de Moraes Holschuh Date: Fri Jun 29 01:08:49 2007 -0400 Input: add a new EV_SW SW_RADIO event, for radio switches on laptops Many laptops have rf-kill physical switches that are not keys, but slider or rocker switches. Often (like in all ThinkPads with a radio kill slider switch), they have both a slider/rocker switch and a hot key. Trying to kludge a real switch to act like a key is not a very smart thing to do if you can help it, and it gets specially bad when you are going to have both in the same machine. So, we do the right thing and add an input EV_SW event for radio kill switches. The EV_SW SW_RADIO event is defined with positive logic, i.e. when the switch is active, the radios are to be enabled. When the switch is inactive, the radios are to be disabled. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Dmitry Torokhov commit 33143ea1a34d12699e6aa222ba124498abcfe4d1 Author: Dmitry Torokhov Date: Fri Jun 29 01:06:35 2007 -0400 Input: serio - take drv_mutex in serio_cleanup() We need to take serio->drv_mutex in serio_cleanup() to prevent the function from being called while driver is in the middle of attaching to a serio port. Such situation can happen with i8042 and atkbd drivers if user rapidly presses Ctrl-Alt-Del during system startup, and leads to kernel oops. Reported-by: Dave Young Signed-off-by: Dmitry Torokhov commit 7dcf5284d12d7b59359a503d35797295f085f327 Author: Dan Williams Date: Mon Jun 18 12:10:33 2007 -0400 [PATCH] libertas: remove private ioctls Signed-off-by: Christoph Hellwig Acked-by: Dan Williams Signed-off-by: John W. Linville commit 18c96c3497aa871608d57ca5e08de3558159a6c9 Author: Dan Williams Date: Mon Jun 18 12:01:12 2007 -0400 [PATCH] libertas: fix WPA associations by handling ENABLE_RSN correctly Don't clobber the firmware's internal state machine by setting ENABLE_RSN more than once during the 4-way handshake. Check what the ENABLE_RSN status is and only set if it should be changed. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit f8f551089b0ca571b8f95465b6c3e1dd7bcea28e Author: Dan Williams Date: Wed May 30 10:12:55 2007 -0400 [PATCH] libertas: kill wlan_scan_process_results Fold into wlan_scan_networks() and protect with debug defines. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit b59bb616636f58ea650d2800a1dfc41c114f5ef8 Author: Dan Williams Date: Mon Jun 18 11:50:43 2007 -0400 [PATCH] libertas: style fixes Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 9f7a60d6e47a70957e5f6676cfe8c83956b08aa6 Author: Qi Yong Date: Thu Jun 28 00:47:10 2007 -0400 Input: atkbd - use printk_ratelimit for spurious ACK messages Signed-off-by: Qi Yong Signed-off-by: Dmitry Torokhov commit da4249c99fd59c4e224e4f9acaf07669d205bb1d Author: Dmitry Torokhov Date: Thu Jun 28 00:46:56 2007 -0400 Input: atkbd - throttle LED switching On some boxes keyboard controllers are too slow to withstand continuous flow of requests to turn keyboard LEDs on and off and start losing some keypresses or even all of them. Delay executing of LED switching request if we had another one within 50 ms thus easing load on the controller. Signed-off-by: Dmitry Torokhov commit 9d9d50bb2efb50594abfc3941a5504b62c514ebd Author: Dmitry Torokhov Date: Thu Jun 28 00:44:27 2007 -0400 Input: i8042 - add HP Pavilion ZT1000 to the MUX blacklist This should get rid of "atkbd.c: Suprious NAK on isa0060/serio0" messages caused by broken MUX implementation. The box does not have external PS/2 ports and, according to documentation, automatically disables touchpad when an external mouse is plugged into a port replicator, so MUX mode would not work anyway. Signed-off-by: Dmitry Torokhov commit da1f95b4c41e09ef96869552db587452e0da46d6 Author: Robin Getz Date: Mon Jun 25 18:05:53 2007 +0800 Blackfin arch: Fix up remaining printks with proper log levels Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit de3025f4e2bc063c274f561f9daf2b696910ad3b Author: Jie Zhang Date: Mon Jun 25 18:04:12 2007 +0800 Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration Add silicon revision "any" and "none". Add proper -mcpu option according to the cpu and silicon revision configuration. Need update to use latest Blackfin cross compile toolchain. Signed-off-by: Jie Zhang Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu