commit c929bdcba5133b958b5f913b7de9bdba61025c64 Author: Chris Wright Date: Sat Nov 18 19:28:22 2006 -0800 Linux 2.6.18.3 commit d20d58437de6f288c8511475355665cac777bbb5 Author: Steve French Date: Thu Sep 21 07:35:29 2006 +0000 [PATCH] CIFS: New POSIX locking code not setting rc properly to zero on successful unlock in case where server does not support POSIX locks and nobrl is not specified. Signed-off-by: Steve French Signed-off-by: Chris Wright commit 1d520e5839dc938021a473ea39d1df8cb60e5129 Author: Steve French Date: Fri Nov 3 01:59:05 2006 +0000 [PATCH] CIFS: report rename failure when target file is locked by Windows Fixes Samba bugzilla bug # 4182 Rename by handle failures (retry after rename by path) were not being returned back. Signed-off-by: Steve French [chrisw: trivial backport in CHANGES] Signed-off-by: Chris Wright commit 4c6c0155efd4822bcca091651dd505e62307d5a5 Author: Jens Axboe Date: Wed Nov 15 00:59:02 2006 +0000 [PATCH] cciss: fix iostat cciss needs to call disk_stat_add() for iostat to work. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit 15b391fe275c650b6f70dd9c82b6b12d640e46b5 Author: Jens Axboe Date: Wed Nov 15 00:59:03 2006 +0000 [PATCH] cpqarray: fix iostat cpqarray needs to call disk_stat_add() for iostat to work. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit ad9c08315e696506734a33c9f0324b5d9858ec6e Author: Jiri Slaby Date: Wed Nov 15 00:59:11 2006 +0000 [PATCH] Char: isicom, fix close bug port is dereferenced even if it is NULL. Dereference it _after_ the check if (!port)... Thanks Eric for reporting this. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7527 Signed-off-by: Jiri Slaby Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit 6d7e0615152b01b5bd1dd8c9aea5d949e50fed93 Author: Jens Axboe Date: Mon Nov 13 17:59:01 2006 +0000 [PATCH] block: Fix bad data direction in SG_IO Contrary to what the name misleads you to believe, SG_DXFER_TO_FROM_DEV is really just a normal read seen from the device side. This patch fixes http://lkml.org/lkml/2006/10/13/100 Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit 797555ff2bd8d6ae181416d8f3c1abe69a3b7363 Author: David Miller Date: Mon Nov 13 16:59:03 2006 +0000 [PATCH] pci: don't try to remove sysfs files before they are setup. The PCI sysfs attributes are created after the initial PCI bus scan. With the addition of more return value checking and assertions in the device and sysfs layers we now can get dumps like this on sparc64: [ 20.135032] Call Trace: [ 20.135042] [0000000000537f88] pci_remove_bus_device+0x30/0xc0 [ 20.135076] [000000000078f890] pci_fill_in_pbm_cookies+0x98/0x440 [ 20.135109] [000000000042e828] sabre_scan_bus+0x230/0x400 [ 20.135139] [000000000078c710] pcibios_init+0x58/0xa0 [ 20.135159] [0000000000416f14] init+0x9c/0x2e0 [ 20.135190] [0000000000417a50] kernel_thread+0x38/0x60 [ 20.135211] [0000000000417170] rest_init+0x18/0x40 [ 20.135514] PCI0(PBMB): Bus running at 33MHz It's triggering because removal of the "config" PCI sysfs file for the device fails. On sparc64, after probing the device, we'll delete the PCI device via pci_remove_bus_device() if we cannot find the firmware device tree node corresponding to it. This is fine, but at this point the sysfs files for the PCI device won't be setup yet. So we should not try to do anything in pci_remove_sysfs_dev_files() if pci_sysfs_init() has not run yet. Signed-off-by: David S. Miller Acked-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit 606868e0407b18878d97eab2677e8d708e30954c Author: Wink Saville Date: Mon Nov 13 16:59:04 2006 +0000 [PATCH] Patch for nvidia divide by zero error for 7600 pci-express card The following patch resolves the divide by zero error I encountered on my system: http://marc.10east.com/?l=linux-fbdev-devel&m=116058257024413&w=2 I accomplished this by merging what I thought was appropriate from: http://webcvs.freedesktop.org/xorg/driver/xf86-video-nv/src/ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit 419ba04762ae21078fafbaff881ef660725ad967 Author: Dave Jones Date: Sun Oct 1 08:02:47 2006 +0000 [PATCH] CPUFREQ: Make acpi-cpufreq unsticky again. This caused suspend/resume regressions. Signed-off-by: Dave Jones Signed-off-by: Chris Wright commit c721af6db5992d16fbd93855666eafa616512e00 Author: Adrian Bunk Date: Wed Nov 15 17:01:46 2006 +0100 [PATCH] security/seclvl.c: fix time wrap (CVE-2005-4352) initlvl=2 in seclvl gives the guarantee "Cannot decrement the system time". But it was possible to set the time to the maximum unixtime value (19 Jan 2038) resulting in a wrap to the minimum value. This patch fixes this by disallowing setting the time to any date after 2030 with initlvl=2. This patch does not apply to kernel 2.6.19 since the seclvl module was already removed in this kernel. Signed-off-by: Adrian Bunk Signed-off-by: Chris Wright commit 9a74fa0d377c3c1e633491b5500296174f4c41df Author: Daniel Ritz Date: Tue Nov 14 02:03:25 2006 -0800 [PATCH] fix via586 irq routing for pirq 5 Fix interrupt routing for via 586 bridges. pirq can be 5 which needs to be mapped to INTD. But currently the access functions can handle only pirq 1-4. this is similar to the other via chipsets where pirq 4 and 5 are both mapped to INTD. Fixes bugzilla #7490 Cc: Daniel Paschka Cc: Adrian Bunk Signed-off-by: Daniel Ritz Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit 37ccc3f978bc86c131eea70d7a5afb29b2ca3404 Author: Herbert Xu Date: Wed Nov 8 22:33:56 2006 -0800 [PATCH] NET: Set truesize in pskb_copy Since pskb_copy tacks on the non-linear bits from the original skb, it needs to count them in the truesize field of the new skb. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit b2d4f8d42c3ab6360dde290fc184182d5e371911 Author: John Heffner Date: Wed Nov 8 22:31:14 2006 -0800 [PATCH] TCP: Don't use highmem in tcp hash size calculation. This patch removes consideration of high memory when determining TCP hash table sizes. Taking into account high memory results in tcp_mem values that are too large. Signed-off-by: John Heffner Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit 26192851aed037f2c928d9cc5d42f507876625b5 Author: Olaf Hering Date: Wed Nov 8 19:58:07 2006 -0800 [PATCH] correct keymapping on Powerbook built-in USB ISO keyboards similar to the version in adbhid_input_register(): The '<>' key and the '^°' key on a german keyboard is swapped. Provide correct keys to userland, external USB keyboards will not work correctly when the 'badmap'/'goodmap' workarounds from xkeyboard-config are used. It is expected that distributions drop the badmap/goodmap part from keycodes/macintosh in the xkeyboard-config package. This is probably 2.6.18.x material, if major distros settle on 2.6.18. Signed-off-by: Olaf Hering Cc: Greg KH Cc: Dmitry Torokhov Cc: Benjamin Herrenschmidt Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright commit ff5c16c433e2c18520c1076912ca84b42f1bd715 Author: Andi Kleen Date: Sat Nov 11 04:16:36 2006 +0100 [PATCH] x86_64: Fix FPU corruption This reverts an earlier patch that was found to cause FPU state corruption. I think the corruption happens because unlazy_fpu() can cause FPU exceptions and when it happens after the current switch some processing would affect the state in the wrong process. Thanks to Douglas Crosher and Tom Hughes for testing. Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Chris Wright commit 4c52d9e3728fcd7153510f4dce2fad4718408629 Author: Sergey Vlasov Date: Tue Nov 7 20:02:36 2006 +0300 [PATCH] Input: psmouse - fix attribute access on 64-bit systems psmouse_show_int_attr() and psmouse_set_int_attr() were accessing unsigned int fields as unsigned long, which gave garbage on x86_64. Signed-off-by: Sergey Vlasov Signed-off-by: Chris Wright commit 90be3aa1886f6c18b99aacf6c682cf6c3493d385 Author: David Miller Date: Mon Nov 6 15:07:16 2006 -0800 [PATCH] NET: __alloc_pages() failures reported due to fragmentation We have seen a couple of __alloc_pages() failures due to fragmentation, there is plenty of free memory but no large order pages available. I think the problem is in sock_alloc_send_pskb(), the gfp_mask includes __GFP_REPEAT but its never used/passed to the page allocator. Shouldnt the gfp_mask be passed to alloc_skb() ? Signed-off-by: Larry Woodman Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit f8d0f4c70c1b99e37102367bf37e394245fae1c0 Author: Auke Kok Date: Mon Nov 6 08:57:12 2006 -0800 [PATCH] e1000: Fix regression: garbled stats and irq allocation during swsusp e1000: Fix suspend/resume powerup and irq allocation From: Auke Kok After 7.0.33/2.6.16, e1000 suspend/resume left the user with an enabled device showing garbled statistics and undetermined irq allocation state, where `ifconfig eth0 down` would display `trying to free already freed irq`. Explicitly free and allocate irq as well as powerup the PHY during resume fixes when needed. Signed-off-by: Auke Kok [chrisw: trivial 2.6.18 backport s/err/ret_val/] Signed-off-by: Chris Wright commit b7d3dcaa7a0b39129ac089ab1a6d9179c0a7fb1b Author: Daniel Ritz Date: Fri Nov 3 22:59:28 2006 +0000 [PATCH] usbtouchscreen: use endpoint address from endpoint descriptor use the endpoint address from the endpoint descriptor instead of the hardcoding it to 0x81. at least some ITM based screen use a different address and don't work without this. Signed-off-by: Daniel Ritz Cc: Ralf Lehmann Cc: J.P. Delport Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright commit fa4788169281af4b64d1fb077f6312fef535c184 Author: Oliver Neukum Date: Fri Nov 3 22:59:29 2006 +0000 [PATCH] USB: failure in usblp's error path USB: failure in usblp's error path if urb submission fails due to a transient error here eg. ENOMEM , the driver is dead. This fixes it. Regards Oliver Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright commit 9bc1aba21be5de887e94770441fe2882455503c2 Author: Daniel Yeisley Date: Thu Nov 2 22:07:14 2006 -0800 [PATCH] init_reap_node() initialization fix It looks like there is a bug in init_reap_node() in slab.c that can cause multiple oops's on certain ES7000 configurations. The variable reap_node is defined per cpu, but only initialized on a single CPU. This causes an oops in next_reap_node() when __get_cpu_var(reap_node) returns the wrong value. Fix is below. Signed-off-by: Dan Yeisley Cc: Andi Kleen Acked-by: Christoph Lameter Cc: Pekka Enberg Cc: Manfred Spraul Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit ae76e93b97d3d44a0fdb5d99b9202ae167c88b6a Author: Yvan Seth Date: Thu Nov 2 22:07:13 2006 -0800 [PATCH] ipmi_si_intf.c sets bad class_mask with PCI_DEVICE_CLASS Taken from http://bugzilla.kernel.org/show_bug.cgi?id=7439 It looks like device registration in drivers/char/ipmi/ipmi_si_intf.c was cleaned up and a small error was made when setting the class_mask. The fix is simple as the correct mask value is defined in the code but is not used. Acked-by: Corey Minyard Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit bde6977b2ce5d012114c3e748c7d4fc1189b34ec Author: Eric Sandeen Date: Thu Nov 2 22:07:05 2006 -0800 [PATCH] fix UFS superblock alignment issues ufs2 fails to mount on x86_64, claiming bad magic. This is because ufs_super_block_third's fs_un1 member is padded out by 4 bytes for 8-byte alignment, pushing down the rest of the struct. Forcing this to be packed solves it. I took a quick look over other on-disk structures and didn't immediately find other problems. I was able to mount & ls a populated ufs2 filesystem w/ this change. Signed-off-by: Eric Sandeen Cc: Evgeniy Dushistov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright commit 459e0483aef6bb6845edab97fc6731dabe02120c Author: David Miller Date: Sun Nov 5 16:58:44 2006 -0800 [PATCH] SPARC: Fix missed bump of NR_SYSCALLS. When I added the robust futex syscall entries I forgot to bump NR_SYSCALLS. This is an easy mistake to make because NR_SYSCALLS lived in entry.S which is nowhere near unistd.h or syscalls.S, so while we're here move it's definition into unistd.h so this is unlikely to ever happen again. Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit d8b789ca13e5bccc3167d0cfa6cec3ff4b541891 Author: Stephen Rothwell Date: Fri Nov 3 14:42:43 2006 +1100 [PATCH] Fix sys_move_pages when a NULL node list is passed. sys_move_pages() uses vmalloc() to allocate an array of structures that is fills with information passed from user mode and then passes to do_stat_pages() (in the case the node list is NULL). do_stat_pages() depends on a marker in the node field of the structure to decide how large the array is and this marker is correctly inserted into the last element of the array. However, vmalloc() doesn't zero the memory it allocates and if the user passes NULL for the node list, then the node fields are not filled in (except for the end marker). If the memory the vmalloc() returned happend to have a word with the marker value in it in just the right place, do_pages_stat will fail to fill the status field of part of the array and we will return (random) kernel data to user mode. Signed-off-by: Stephen Rothwell Acked-by: Christoph Lameter Signed-off-by: Chris Wright commit fbce4d7fea4bd2a3e54be9c1c29440d5b4dfc600 Author: David Miller Date: Wed Nov 1 21:55:00 2006 -0800 [PATCH] SPARC64: Fix futex_atomic_cmpxchg_inatomic implementation. I copied the logic from ll/sc arch implementations, but that was wrong and makes no sense at all. Just do a straight compare-exchange instruction, just like x86. Based upon bug reports from Dennis Gilmore and Fabio Massimo. Signed-off-by: David S. Miller Signed-off-by: Chris Wright commit 413f83a2b9826449d1b70961e55c482ec8309b49 Author: Benjamin Herrenschmidt Date: Wed Nov 1 15:11:39 2006 +1100 [PATCH] POWERPC: Make alignment exception always check exception table The alignment exception used to only check the exception table for -EFAULT, not for other errors. That opens an oops window if we can coerce the kernel into getting an alignment exception for other reasons in what would normally be a user-protected accessor, which can be done via some of the futex ops. This fixes it by always checking the exception tables. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras Signed-off-by: Chris Wright commit 6d2654aef9d0af26ac75e1f13bf27d7c0a2c8a5a Author: Martin Schwidefsky Date: Fri Nov 3 15:43:36 2006 +0100 [PATCH] S390: user readable uninitialised kernel memory, take 2. The previous patch to correct the copy_from_user padding is quite broken. The execute instruction needs to be done via the register %r4, not via %r2 and 31 bit doesn't know the instructions lgr and ahji. Signed-off-by: Martin Schwidefsky Signed-off-by: Chris Wright