commit d5ea4e26602fa7f5141872f2c17a862f1974a73f tree b403b2c2a8a2baf30755ea044ecea9dca495934c parent c7ac6b42ffba28c350cbcd48268f46689f6eb1cc parent 863a930a40eb7f2d18534c2c166b22582f5c6cfd author Linus Torvalds Wed, 21 Dec 2005 15:09:50 -0800 committer Linus Torvalds Wed, 21 Dec 2005 15:09:50 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 commit c7ac6b42ffba28c350cbcd48268f46689f6eb1cc tree 51520d34b0fa957a80eb645f6f56bc561ec3d233 parent 5a9191ff683ce4ebfd2c6a15e2989f5b1f420321 author Linus Torvalds Wed, 21 Dec 2005 14:52:32 -0800 committer Linus Torvalds Wed, 21 Dec 2005 14:52:32 -0800 Initialize drivers/media/video/saa7134 late When compiled-in, make sure the sound system has initialized before these drivers do. Reported by Adrian Bunk (The right fix would be to make the sound core use "subsys_initcall()" and thus initialize before all normal drivers, but this is the quick and limited safe fix for 2.6.15). Signed-off-by: Linus Torvalds commit 5a9191ff683ce4ebfd2c6a15e2989f5b1f420321 tree e4b18ed80e48bfd01560f44dfc61e9fab57c71cb parent 28120be5d6830cd7c7777d8bf570bdb20abef58a author Alan Stern Wed, 21 Dec 2005 14:28:11 -0800 committer Linus Torvalds Wed, 21 Dec 2005 14:46:35 -0800 [PATCH] usbcore: allow suspend/resume even if drivers don't support it This patch (as618) changes usbcore to prevent derailing the suspend/resume sequence when a USB driver doesn't include support for it. This is a workaround rather than a true fix; the core needs to be changed so that URB submissions from suspended drivers can be refused and outstanding URBs cancelled. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 28120be5d6830cd7c7777d8bf570bdb20abef58a tree a7aecedc557ae1c5ae4b4d7fa21a1eed879c842e parent 23f9b317e0ba4fbc5fc9524275d0105fa87e2027 author Paul Walmsley Wed, 21 Dec 2005 14:28:06 -0800 committer Linus Torvalds Wed, 21 Dec 2005 14:46:34 -0800 [PATCH] USB Storage: Force starget->scsi_level in usb-storage scsiglue.c When the usb-storage module forces sdev->scsi_level to SCSI_2, it should also force starget->scsi_level to the same value. Otherwise, the SCSI layer may attempt to issue SCSI-3 commands to the device, such as REPORT LUNS, which it cannot handle. This can prevent the device from working with Linux. The AMS Venus DS3 DS2316SU2S SATA-to-SATA+USB enclosure, based on the Oxford Semiconductor OXU921S chip, requires this patch to function correctly on Linux. The enclosure reports a SCSI-3 SPC-2 command set level, but does not correctly handle the REPORT LUNS SCSI command - probably due to a bug in its firmware. It seems likely that other USB storage enclosures with similar bugs will also benefit from this patch. Tony Lindgren collaborated in the development of this patch. Signed-off-by: Paul Walmsley Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 23f9b317e0ba4fbc5fc9524275d0105fa87e2027 tree 5d5681de11b3cb626d26485482de5d5838569ae8 parent bee5ab3f572d9499c42e75b958ff7309ff830a13 author Adrian Bunk Wed, 21 Dec 2005 02:27:50 +0100 committer Linus Torvalds Wed, 21 Dec 2005 14:45:25 -0800 [PATCH] include/linux/irq.h: #include Jan's crosscompile page [1] shows, that one regression in 2.6.15-rc is that the v850 defconfig does no longer compile. The compile error is: <-- snip --> ... CC arch/v850/kernel/setup.o In file included from /usr/src/ctest/rc/kernel/arch/v850/kernel/setup.c:17: /usr/src/ctest/rc/kernel/include/linux/irq.h:13:43: asm/smp.h: No such file or directory make[2]: *** [arch/v850/kernel/setup.o] Error 1 <-- snip --> The #include in irq.h was intruduced in 2.6.15-rc. Since include/linux/irq.h needs code from asm/smp.h only in the CONFIG_SMP=y case and linux/smp.h #include's asm/smp.h only in the CONFIG_SMP=y case, I'm suggesting this patch to #include in irq.h. I've tested the compilation with both CONFIG_SMP=y and CONFIG_SMP=n on i386. Signed-off-by: Adrian Bunk Acked-by: Andrew Morton Signed-off-by: Linus Torvalds commit bee5ab3f572d9499c42e75b958ff7309ff830a13 tree ec48438ed1a7b3d3794a0a4cc577d0bab69b7f03 parent b05948d9b7167e23af88cc65b9ffa4687eaf1f0d parent 5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 author Linus Torvalds Wed, 21 Dec 2005 11:05:15 -0800 committer Linus Torvalds Wed, 21 Dec 2005 11:05:15 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 commit b05948d9b7167e23af88cc65b9ffa4687eaf1f0d tree 12b7646800600b17cbe019fa3b452a57231f1594 parent fd30fc3256824f03c2ff9317269d66f72f7042ca parent a9c9dff1bc64750c81ee99779164d304c35d2ff3 author Linus Torvalds Tue, 20 Dec 2005 17:33:54 -0800 committer Linus Torvalds Tue, 20 Dec 2005 17:33:54 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit fd30fc3256824f03c2ff9317269d66f72f7042ca tree 863a1ba4ddae961e2727343c17d15f64c3f4d463 parent bb44f116a14c4c932f15c79acfafd46bcb43ca9a author Tom Zanussi Tue, 20 Dec 2005 13:10:22 -0600 committer Linus Torvalds Tue, 20 Dec 2005 17:33:22 -0800 [PATCH] relayfs: remove warning printk() in relay_switch_subbuf() There's currently a diagnostic printk in relay_switch_subbuf() meant as a warning if you accidentally try to log an event larger than the sub-buffer size. The problem is if this happens while logging from somewhere it's not safe to be doing printks, such as in the scheduler, you can end up with a deadlock. This patch removes the warning from relay_switch_subbuf() and instead prints some diagnostic info when the channel is closed. Thanks to Mathieu Desnoyers for pointing out the problem and suggesting a fix. Signed-off-by: Tom Zanussi Signed-off-by: Linus Torvalds commit a9c9dff1bc64750c81ee99779164d304c35d2ff3 tree 26f0c21862afe034f3cc1524dd14e7d2ab678aac parent bb44f116a14c4c932f15c79acfafd46bcb43ca9a author David S. Miller Tue, 20 Dec 2005 14:53:05 -0800 committer David S. Miller Tue, 20 Dec 2005 14:53:05 -0800 [SPARC64]: Stop putting -finline-limit=XXX into CFLAGS It was a stupid workaround for the "static inline" vs. "extern inline" issues of long ago, and it is what causes schedule() to be inlined like crazy into kernel/sched.c when -Os is specified. MIPS and S390 should probably do the same. Now CC_OPTIMIZE_FOR_SIZE can be safely used on sparc64 once more. Signed-off-by: David S. Miller commit bb44f116a14c4c932f15c79acfafd46bcb43ca9a tree d8f5dc090cef75f22e7ca152298096bb2877b6b8 parent 391eadeec836463a4e6e3843953bbe40f6522593 author Ingo Molnar Tue, 20 Dec 2005 11:54:17 +0100 committer Linus Torvalds Tue, 20 Dec 2005 10:47:55 -0800 [PATCH] fix spinlock-debugging smp_processor_id() usage When a spinlock debugging check hits, we print the CPU number as an informational thing - but there is no guarantee that preemption is off at that point - hence we should use raw_smp_processor_id(). Otherwise DEBUG_PREEMPT will print a warning. With this fix the warning goes away and only the spinlock-debugging info is printed. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 391eadeec836463a4e6e3843953bbe40f6522593 tree 4ffdfc0daab85cf32f2b0c29f6750b7bfd939a7e parent b7964c3d88668cef57e1a99861477168eeff4743 author Andi Kleen Tue, 20 Dec 2005 07:23:47 +0100 committer Linus Torvalds Tue, 20 Dec 2005 10:41:57 -0800 [PATCH] Fix build with CONFIG_PCI_MMCONFIG Now needs to include the type 1 functions ("direct") too. Reported by Pavel Roskin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b7964c3d88668cef57e1a99861477168eeff4743 tree 8672bb2693fccdb97eaad46c7d59ef3c2ff069bf parent 9e28393998d3d0733097306762f6d1c083fc92c6 author Andreas Gruenbacher Tue, 20 Dec 2005 16:29:05 +0100 committer Linus Torvalds Tue, 20 Dec 2005 10:31:33 -0800 [PATCH] nfsd: check for read-only exports before setting acls We must check for MAY_SATTR before setting acls, which includes checking for read-only exports: the lower-level setxattr operation that eventually sets the acl cannot check export-level restrictions. Bug reported by Martin Walter . Signed-off-by: Andreas Gruenbacher Acked-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 9e28393998d3d0733097306762f6d1c083fc92c6 tree 9cc87f8c1f936164fd570c58126ef761839f74e3 parent 7e8702334841b6da4b8f564dc1771ca17c59a621 author Jason Wessel Tue, 20 Dec 2005 15:21:24 +0100 committer Linus Torvalds Tue, 20 Dec 2005 10:31:33 -0800 [PATCH] kernel/params.c: fix sysfs access with CONFIG_MODULES=n All the work was done to setup the file and maintain the file handles but the access functions were zeroed out due to the #ifdef. Removing the #ifdef allows full access to all the parameters when CONFIG_MODULES=n. akpm: put it back again, but use CONFIG_SYSFS instead. Signed-off-by: Jason Wessel Signed-off-by: Andrew Morton Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 7e8702334841b6da4b8f564dc1771ca17c59a621 tree 73f52ad8b0b61a5d863b324041bcc519d7cc5242 parent 7ca0b3bf695632003a2a0f98b9fc1451b0483346 author Andi Kleen Tue, 20 Dec 2005 14:45:19 +0100 committer Linus Torvalds Tue, 20 Dec 2005 10:13:54 -0800 [PATCH] Fix swiotlb pci_map_sg error handling The overflow checking condition in lib/swiotlb.c was wrong. It would first run a NULL pointer through virt_to_phys before testing it. Since pci_map_sg overflow is not that uncommon and causes data corruption (including broken file systems) when not properly detected I think it's better to fix it in 2.6.15. This affects x86-64 and IA64. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7ca0b3bf695632003a2a0f98b9fc1451b0483346 tree 149233620d7d18a45c31bfb357321886b19eed52 parent d5d74efbeac61c73431e8ef032e97d2d1004ce88 author Knut Petersen Tue, 20 Dec 2005 08:18:09 +0100 committer Linus Torvalds Tue, 20 Dec 2005 09:44:20 -0800 [PATCH] Fix framebuffer console upside-down ywrap scrolling Whenever ywrap scrolling is selected together with 180 degree screen rotation, 2.6.15-rc6 and earlier versions are broken. fb_pan_display() expects non-negative yoffsets, but ud_update_start() calls it with yoffsets down to -(yres - font height). This patch transforms yoffset to the correct range 0 ... vyres-1. Some obviously unneeded parentheses are removed, too. Verified with cyblafb, should be applied before 2.6.15-final because it does fix the framebuffer rotation code introduced early in the 2.6.15 release cycle. Signed-off-by: Knut Petersen Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit d5d74efbeac61c73431e8ef032e97d2d1004ce88 tree 7ad8a86b8d203ef566cb89656bf394a8dcd7edd3 parent fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e parent 5a1244e9ddb77eafb1de69a1be14e06ca04e733a author Linus Torvalds Tue, 20 Dec 2005 09:41:25 -0800 committer Linus Torvalds Tue, 20 Dec 2005 09:41:25 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e tree 489070a6f39a062c7f51cab3cb4c976810eb7556 parent 33c37c06f8066342764bd1568c9f3524efe889a5 parent 9b5b1f5bf9dcdb6f23abf65977a675eb4deba3c0 author Linus Torvalds Tue, 20 Dec 2005 09:35:05 -0800 committer Linus Torvalds Tue, 20 Dec 2005 09:35:05 -0800 Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6 commit 33c37c06f8066342764bd1568c9f3524efe889a5 tree ba308b43facb9fc39f412dc82ee79e96cd022df8 parent 4b3760ce3d448d4af3036cd6c650d651a16ee02d author Antonino A. Daplas Mon, 19 Dec 2005 15:11:49 +0800 committer Linus Torvalds Tue, 20 Dec 2005 09:27:15 -0800 [PATCH] intelfb: Fix oops when changing video mode Reported by: janis huang (Bugzilla Bug 5747) Fix on oops in intelfb. Not sure what's happening, looks like dinfo->name pointer is invalidated after initialization. Remove intelfb_get_fix, it's not needed and move the majority of the code to the initialization routine. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 4b3760ce3d448d4af3036cd6c650d651a16ee02d tree 369f5680fad714f215f7b96b7b62975d55c55424 parent 6ee7fb7e363aa8828b3920422416707c79f39007 author Antonino A. Daplas Mon, 19 Dec 2005 15:11:40 +0800 committer Linus Torvalds Tue, 20 Dec 2005 09:27:15 -0800 [PATCH] intelfb: Fix freeing of nonexistent resource Fix intelfb trying to free a non-existent resource in its error path. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 6ee7fb7e363aa8828b3920422416707c79f39007 tree 2a11705c9ba8507ce7a31893acde957fb98ea8c5 parent 3e1ec1f43307575d4e04c513aa3c30d69c32b9dc author Benjamin Herrenschmidt Mon, 19 Dec 2005 11:24:53 +1100 committer Linus Torvalds Tue, 20 Dec 2005 09:25:33 -0800 [PATCH] powerpc: g5 thermal overtemp bug The g5 thermal control for liquid cooled machines has a small bug, when the temperatures gets too high, it boosts all fans to the max, but incorrectly sets the liquids pump to the min instead of the max speed, thus causing the overtemp condition not to clear and the machine to shut down after a while. This fixes it to set the pumps to max speed instead. This problem might explain some of the reports of random shutdowns that some g5 users have been reporting in the past. Many thanks to Marcus Rothe for spending a lot of time trying various patches & sending log logs before I found out that typo. Note that overtemp handling is still not perfect and the machine might still shutdown, that patch should reduce if not eliminate such occcurences in "normal" conditions with high load. I'll implement a better handling with proper slowing down of the CPUs later. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 5a1244e9ddb77eafb1de69a1be14e06ca04e733a tree 1993d325379cb909e0eb216dd5bb767230b24dcd parent b273ed266a353ee6b238856e1ae705660dafdd70 author Paul Mackerras Tue, 20 Dec 2005 16:00:17 +1100 committer Paul Mackerras Tue, 20 Dec 2005 16:00:17 +1100 powerpc: update defconfigs Signed-off-by: Paul Mackerras commit b273ed266a353ee6b238856e1ae705660dafdd70 tree ecc520a875549537e61de65ad624bb08341b69f3 parent 3eb6f26bcd0d2ce53498deda988e68d663e1c9c2 author Edson Seabra Mon, 19 Dec 2005 09:16:50 -0600 committer Paul Mackerras Tue, 20 Dec 2005 15:39:33 +1100 [PATCH] powerpc: CPM2 interrupt handler failure after 100,000 interrupts The CPM2 interrupt handler does not return success to the IRQ subsystem, which causes it to kill the IRQ line after 100,000 interrupts. Signed-off-by: Edson Seabra Signed-off-by: Marcelo Tosatti Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 3eb6f26bcd0d2ce53498deda988e68d663e1c9c2 tree 2e52267600ebfe1f97cbab822143197d0a9edaa3 parent 7116317dc9148d783846299fc80a7d377baa6dca author Paul Mackerras Tue, 20 Dec 2005 15:38:47 +1100 committer Paul Mackerras Tue, 20 Dec 2005 15:38:47 +1100 powerpc: correct register usage in 64-bit syscall exit path Since we don't restore the volatile registers in the syscall exit path, we need to make sure we don't leak any potentially interesting values from the kernel to userspace. This was already the case for all except r11. This makes it use r11 for an MSR value, so r11 will have an (uninteresting) MSR value in it on return to userspace. Signed-off-by: Paul Mackerras commit 9b5b1f5bf9dcdb6f23abf65977a675eb4deba3c0 tree 2f7f341d38d6a8ae71ff1fefa9e48a467b34f5a1 parent 48e49187753ec3b4fa84a7165c9b7a59f3875b56 author Trond Myklebust Mon, 19 Dec 2005 17:11:25 -0500 committer Trond Myklebust Mon, 19 Dec 2005 23:12:31 -0500 NLM: Fix Oops in nlmclnt_mark_reclaim() When mixing -olock and -onolock mounts on the same client, we have to check that fl->fl_u.nfs_fl.owner is set before dereferencing it. Signed-off-by: Trond Myklebust commit 48e49187753ec3b4fa84a7165c9b7a59f3875b56 tree 7f20c20f2b4e653ba49d0b6639039e47607a409c parent 29884df0d89c1df0dec3449405bc41569bb44800 author Trond Myklebust Mon, 19 Dec 2005 17:11:22 -0500 committer Trond Myklebust Mon, 19 Dec 2005 23:12:21 -0500 SUNRPC: Fix "EPIPE" error on mount of rpcsec_gss-protected partitions gss_create_upcall() should not error just because rpc.gssd closed the pipe on its end. Instead, it should requeue the pending requests and then retry. Signed-off-by: Trond Myklebust commit 29884df0d89c1df0dec3449405bc41569bb44800 tree b836dc3ece80a901d1b7a9e946bf0d51ec0c8c4f parent b079fa7baa86b47579f3f60f86d03d21c76159b8 author Trond Myklebust Tue, 13 Dec 2005 16:13:54 -0500 committer Trond Myklebust Mon, 19 Dec 2005 23:12:09 -0500 NFS: Fix another O_DIRECT race Ensure we call unmap_mapping_range() and sync dirty pages to disk before doing an NFS direct write. Signed-off-by: Trond Myklebust commit b079fa7baa86b47579f3f60f86d03d21c76159b8 tree a62d8d031315459083d546e639faaa5ce0162a03 parent 3e1ec1f43307575d4e04c513aa3c30d69c32b9dc author Trond Myklebust Tue, 13 Dec 2005 16:13:52 -0500 committer Trond Myklebust Mon, 19 Dec 2005 23:11:54 -0500 RPC: Do not block on skb allocation If we get something like the following, [ 125.300636] [] schedule_timeout+0x54/0xa5 [ 125.305931] [] io_schedule_timeout+0x29/0x33 [ 125.311495] [] blk_congestion_wait+0x70/0x85 [ 125.317058] [] throttle_vm_writeout+0x69/0x7d [ 125.322720] [] shrink_zone+0xe0/0xfa [ 125.327560] [] shrink_caches+0x6d/0x6f [ 125.332581] [] try_to_free_pages+0xd0/0x1b5 [ 125.338056] [] __alloc_pages+0x135/0x2e8 [ 125.343258] [] tcp_sendmsg+0xaa0/0xb78 [ 125.348281] [] inet_sendmsg+0x48/0x53 [ 125.353212] [] sock_sendmsg+0xb8/0xd3 [ 125.358147] [] kernel_sendmsg+0x42/0x4f [ 125.363259] [] sock_no_sendpage+0x5e/0x77 [ 125.368556] [] xs_tcp_send_request+0x2af/0x375 then the socket is blocked until memory is reclaimed, and no progress can ever be made. Try to access the emergency pools by using GFP_ATOMIC. Signed-off-by: Trond Myklebust commit 3e1ec1f43307575d4e04c513aa3c30d69c32b9dc tree 5417813a188df32e49e55515d50b975f7ccbe50a parent bcb97940f31ded5ac551da8bfc849583203fc6f2 parent ecfa4fdca15c089e372095325d9e78264224aeb3 author Linus Torvalds Mon, 19 Dec 2005 18:34:37 -0800 committer Linus Torvalds Mon, 19 Dec 2005 18:34:37 -0800 Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb commit bcb97940f31ded5ac551da8bfc849583203fc6f2 tree 45fe99d622583afc2a433f8a6dbc949937fbbcd6 parent f98d2dfd02183e016a6295f72140c60d691c9188 author Neil Brown Tue, 20 Dec 2005 11:07:00 +1100 committer Linus Torvalds Mon, 19 Dec 2005 16:47:50 -0800 [PATCH] md: Change case of raid level reported in sys/mdX/md/level I had thought that keeping the reported tail level clearly different from the module name was a good idea, but I've changed my mind. 'raid5' is better and probably less confusing than 'RAID-5'. Signed-off-by: Neil Brown Signed-off-by: Linus Torvalds commit f98d2dfd02183e016a6295f72140c60d691c9188 tree d92ac89a1e5096f979bb93029b3f06e46973e7ca parent 931b11be325e0e866b64bac7cab64d51c7759371 author Ben Collins Mon, 19 Dec 2005 11:49:24 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:47:50 -0800 [PATCH] block: Cleanup CDROMEJECT ioctl This is just a basic cleanup. No change in functionality. Signed-off-by: Ben Collins Signed-off-by: Linus Torvalds commit 931b11be325e0e866b64bac7cab64d51c7759371 tree 1160085424552859138cf6b92acfbc66d86e64b8 parent 546ac8a63186a06e5d21778eefa4695232aee5b8 parent 38690194bc897dd60a61a71b15e861e13b5d8bdd author Linus Torvalds Mon, 19 Dec 2005 16:46:14 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:46:14 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 546ac8a63186a06e5d21778eefa4695232aee5b8 tree 9af42a244753596cd30ac90473fe9f76ee7e9b7e parent ce7fa1b3f9105873f6e26edb7241c848cab70e4d parent ce37e5f90366cb90320a285edd2113fd807f3ab6 author Linus Torvalds Mon, 19 Dec 2005 16:43:57 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:43:57 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit ce7fa1b3f9105873f6e26edb7241c848cab70e4d tree ef88e085dbf26fa10970759876df80adb4a1ae46 parent d898d485e721db45be555c27df5de03281f2fd05 parent 9bffc4ace1ed875667dbe5b29065d96bec558c62 author Linus Torvalds Mon, 19 Dec 2005 16:43:36 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:43:36 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d898d485e721db45be555c27df5de03281f2fd05 tree 2da2fb89a2dd309ef2fd2c651ca87027134c4073 parent df7addbb45874f0f992266003155de5a22e1872f parent 7c612bfd4ed3064fd48a4877a114c8186547367b author Linus Torvalds Mon, 19 Dec 2005 16:43:13 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:43:13 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 38690194bc897dd60a61a71b15e861e13b5d8bdd tree e22bcf8fa17bb374beff14a8fb693334e6e99f19 parent b401e9e2ec44a5fc1d8053546276bff584b7118e author Michael Chan Mon, 19 Dec 2005 16:27:28 -0800 committer David S. Miller Mon, 19 Dec 2005 16:27:28 -0800 [TG3]: Fix ethtool memory test Skip the memory 0xb50 to 0x1000 during "ethtool -t" memory test. Overwriting memory in this region can cause ASF problems. Update version and release date. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b401e9e2ec44a5fc1d8053546276bff584b7118e tree 3f554445d377269c941688d2ce23479bd198d8a3 parent dc56b7d46dd2b303a844166ef931270b882bf08c author Michael Chan Mon, 19 Dec 2005 16:27:04 -0800 committer David S. Miller Mon, 19 Dec 2005 16:27:04 -0800 [TG3]: Add tw32_wait_f() for some sensitive registers The tw32_f() function (register write with immediate read flush) can hang when used on some registers to switch clock frequencies and power. A new tw32_wait_f() is added for such registers with the delay before the read and after the read. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit dc56b7d46dd2b303a844166ef931270b882bf08c tree 80b4270d0addf4cf335b9dd47e5c4507c8f8a7b6 parent 8c2dc7e1e7213c55f1b97eba09de6c0cee9ad12f author Michael Chan Mon, 19 Dec 2005 16:26:28 -0800 committer David S. Miller Mon, 19 Dec 2005 16:26:28 -0800 [TG3]: Some low power fixes Add some missing workarounds in tg3_set_power_state(): 1. Workaround to prevent overdrawing current on 5714. 2. Do not power down 5700's PHY because of hw limitation. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8c2dc7e1e7213c55f1b97eba09de6c0cee9ad12f tree 47bc9b91cc44c68701004494bb9dc9d777ba27a4 parent df7addbb45874f0f992266003155de5a22e1872f author Michael Chan Mon, 19 Dec 2005 16:26:02 -0800 committer David S. Miller Mon, 19 Dec 2005 16:26:02 -0800 [TG3]: Fix peer device handling Locate the pdev_peer for dual port 5714 NIC devices in addition to 5704 devices. The name is also changed to tg3_find_peer() from tg3_find_5704_peer(). It is also necessary to call netdev_priv() to get to the peer's private tg3 structure. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ce37e5f90366cb90320a285edd2113fd807f3ab6 tree a7cd328af50a2434dc0ccd0056b941df04837cc6 parent df7addbb45874f0f992266003155de5a22e1872f author Adrian Bunk Mon, 19 Dec 2005 14:52:24 -0800 committer David S. Miller Mon, 19 Dec 2005 14:52:24 -0800 [SPARC]: Fix RTC build failure. On sparc and sparc64, the rtc driver doesn't compile with PCI support disabled. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9bffc4ace1ed875667dbe5b29065d96bec558c62 tree 8f6f3823c2656b89f15c5438dd711860502d64b8 parent 399c180ac5f0cb66ef9479358e0b8b6bafcbeafe author Neil Horman Mon, 19 Dec 2005 14:24:40 -0800 committer David S. Miller Mon, 19 Dec 2005 14:24:40 -0800 [SCTP]: Fix sctp to not return erroneous POLLOUT events. Make sctp_writeable() use sk_wmem_alloc rather than sk_wmem_queued to determine the sndbuf space available. It also removes all the modifications to sk_wmem_queued as it is not currently used in SCTP. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 399c180ac5f0cb66ef9479358e0b8b6bafcbeafe tree 4014154b7800e96058d94f78dc34a53681e8d5e5 parent 9e999993c71e1506378d26d81f842277aff8a250 author David S. Miller Mon, 19 Dec 2005 14:23:23 -0800 committer David S. Miller Mon, 19 Dec 2005 14:23:23 -0800 [IPSEC]: Perform SA switchover immediately. When we insert a new xfrm_state which potentially subsumes an existing one, make sure all cached bundles are flushed so that the new SA is used immediately. Signed-off-by: David S. Miller commit 7c612bfd4ed3064fd48a4877a114c8186547367b tree bd307ea5bf9c0ad16ad1a590490d9095107d35fc parent 567bd98017d9c9f2ac1c148ddc78c062e8abd398 author Nicolas Pitre Mon, 19 Dec 2005 22:20:51 +0000 committer Russell King Mon, 19 Dec 2005 22:20:51 +0000 [ARM] 3210/1: add missing memory barrier helper for NPTL support Patch from Nicolas Pitre Strictly speaking, the NPTL kernel helpers are required for pre ARMv6 only. They are available on ARMv6+ as well for obvious compatibility reasons. However there are cases where extra memory barriers are needed when using an SMP ARMv6 machine but not on pre-ARMv6. This patch adds a memory barrier kernel helper that glibc can use as needed for pre-ARMv6 binaries to be forward compatible with an SMP kernel on ARMv6, as well as the necessary dmb instructions to the cmpxchg helper. Signed-off-by: Nicolas Pitre Acked-by: Daniel Jacobowitz Signed-off-by: Russell King commit 9e999993c71e1506378d26d81f842277aff8a250 tree 29f17b34f01f83928b23ada0da3f8ea9e0e1b027 parent 3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e author Patrick McHardy Mon, 19 Dec 2005 14:03:46 -0800 committer David S. Miller Mon, 19 Dec 2005 14:03:46 -0800 [XFRM]: Handle DCCP in xfrm{4,6}_decode_session Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e tree 854f73bd7862354eac94b624d436b59fdd5ffecb parent b03664869aa6f84c3c98a06ac9d6905b195909bc author YOSHIFUJI Hideaki Mon, 19 Dec 2005 14:02:45 -0800 committer David S. Miller Mon, 19 Dec 2005 14:02:45 -0800 [IPV6]: Fix route lifetime. The route expiration time is stored in rt6i_expires in jiffies. The argument of rt6_route_add() for adding a route is not the expiration time in jiffies nor in clock_t, but the lifetime (or time left before expiration) in clock_t. Because of the confusion, we sometimes saw several strange errors (FAILs) in TAHI IPv6 Ready Logo Phase-2 Self Test. The symptoms were analyzed by Mitsuru Chinen . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b03664869aa6f84c3c98a06ac9d6905b195909bc tree 222958ab671d7a0493f530bfe3243c119f7c01fe parent 6b80ebedbee87c5b2213fc3635bf0bd7450bce30 author Bart De Schuymer Mon, 19 Dec 2005 14:00:08 -0800 committer David S. Miller Mon, 19 Dec 2005 14:00:08 -0800 [BRIDGE-NF]: Fix bridge-nf ipv6 length check A typo caused some bridged IPv6 packets to get dropped randomly, as reported by Sebastien Chaumontet. The patch below fixes this (using skb->nh.raw instead of raw) and also makes the jumbo packet length checking up-to-date with the code in net/ipv6/exthdrs.c::ipv6_hop_jumbo. Signed-off-by: Bart De Schuymer Signed-off-by: David S. Miller commit 6b80ebedbee87c5b2213fc3635bf0bd7450bce30 tree fc36ebd3aa924a2d0a85226faa750429a80867d9 parent 31cb5bd4dc89ba14e6347b094e15a2f6778a01fc author Kristian Slavov Mon, 19 Dec 2005 13:54:44 -0800 committer David S. Miller Mon, 19 Dec 2005 13:54:44 -0800 [RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h I reported a problem and gave hints to the solution, but nobody seemed to react. So I prepared a patch against 2.6.14.4. Tested on 2.6.14.4 with "ip monitor addr" and with the program attached, while adding and removing IPv6 address. Both programs didn't receive any messages. Tested 2.6.14.4 + this patch, and both programs received add and remove messages. Signed-off-by: Kristian Slavov Acked-by: Jamal Hadi salim ACKed-by: Patrick McHardy Signed-off-by: David S. Miller commit 31cb5bd4dc89ba14e6347b094e15a2f6778a01fc tree 8fd17c84c3a09cd5cd612527706fd3124dd88c22 parent 0476f171affa6eca62021fca2ae9f5140acc3713 author Patrick McHardy Mon, 19 Dec 2005 13:53:26 -0800 committer David S. Miller Mon, 19 Dec 2005 13:53:26 -0800 [NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE IP6_NF_TARGET_NFQUEUE depends on IP6_NF_IPTABLES, not IP_NF_IPTABLES. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0476f171affa6eca62021fca2ae9f5140acc3713 tree 79128848309e1eacfd916acf3f033cfe4cef4590 parent df7addbb45874f0f992266003155de5a22e1872f author Patrick McHardy Mon, 19 Dec 2005 13:53:09 -0800 committer David S. Miller Mon, 19 Dec 2005 13:53:09 -0800 [NETFILTER]: Fix NAT init order As noticed by Phil Oester, the GRE NAT protocol helper is initialized before the NAT core, which makes registration fail. Change the linking order to make NAT be initialized first. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ecfa4fdca15c089e372095325d9e78264224aeb3 tree 870ae4296ae7653d4e996132d5dffb1843782c56 parent 468a0a54aabdac72e9c7bbd4f8372f1df2d9f0ae author Mauro Carvalho Chehab Mon, 19 Dec 2005 09:15:13 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 09:15:13 -0200 [PATCH] V4L/DVB SCM Maintainers Update - This patch updates MAINTAINERS file by replacing quilt to git SCM Signed-off-by: Mauro Carvalho Chehab commit 468a0a54aabdac72e9c7bbd4f8372f1df2d9f0ae tree dfa89d42babe00110bc3c20cc9297c58bd7c8d6c parent 60edb13759096097b7208843dc9b7582a7d14c61 author Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 [PATCH] V4L/DVB (3189): Fix a broken logic that didn't cover all standards. - Fix a broken logic that didn't cover all standards. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Mauro Carvalho Chehab commit 60edb13759096097b7208843dc9b7582a7d14c61 tree fa3903506d22539ee9fd9703de20bf599040eae5 parent 3338761e6c52a8dee631dcc69129c625801ab132 author Oliver Endriss Mon, 19 Dec 2005 08:54:11 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 [PATCH] V4L/DVB (3181): Enable SPDIF output for DVB-S rev 2.3 - Enable SPDIF output for DVB-S rev 2.3. Firmware 2623 or higher required. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 3338761e6c52a8dee631dcc69129c625801ab132 tree cf2fa8ee838402c8fb9414bf22c7d7d00ac594c6 parent f85c657ff1f712abd5207a95fba8a5fcc282ab04 author Ricardo Cerqueira Mon, 19 Dec 2005 08:54:11 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 [PATCH] V4L/DVB (3180): Fix tuner 100 definition for hauppauge eeprom - Tuner 100 is the TUNER_PHILIPS_FMD1216ME_MK3, not TUNER_ABSENT. This was causing the tuner module to be skipped, and rendered boards with this value in the eeprom (like the HVR1100) unable to tune Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit f85c657ff1f712abd5207a95fba8a5fcc282ab04 tree d1b1f834b7a4ef96a3efc9dccb8ad08d56f30ada parent 48ea753075aa15699bd5fac26faa08431aaa697b author Jean Delvare Mon, 19 Dec 2005 08:53:59 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:53:59 -0200 [PATCH] V4L/DVB (3188): Fix compilation failure with gcc 2.95.3. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 863a930a40eb7f2d18534c2c166b22582f5c6cfd tree d2f74a0351a09e184e124fd6ecf16e02ab768a0b parent 42e33148df38c60b99d984b76b302c64397ebe4c author James Bottomley Thu, 15 Dec 2005 20:01:43 -0800 committer James Bottomley Sat, 17 Dec 2005 10:48:08 -0600 [SCSI] fix scsi_reap_target() device_del from atomic context scsi_reap_target() was desgined to be called from any context. However it must do a device_del() of the target device, which may only be called from user context. Thus we have to reimplement scsi_reap_target() via a workqueue. Signed-off-by: James Bottomley commit 567bd98017d9c9f2ac1c148ddc78c062e8abd398 tree 317ade84394ec112c4e8f851b18fbd7df2c26af8 parent 48ea753075aa15699bd5fac26faa08431aaa697b author Russell King Sat, 17 Dec 2005 15:25:42 +0000 committer Russell King Sat, 17 Dec 2005 15:25:42 +0000 [ARM] Fix sys_sendto and sys_recvfrom 6-arg syscalls Rather than providing more wrappers for 6-arg syscalls, arrange for them to be supported as standard. This just means that we always store the 6th argument on the stack, rather than in the wrappers. This means we eliminate the wrappers for: * sys_futex * sys_arm_fadvise64_64 * sys_mbind * sys_ipc Signed-off-by: Russell King commit 42e33148df38c60b99d984b76b302c64397ebe4c tree 8f7b7f446250d7ae5261c09aaf4a8f5e245794dd parent 7116317dc9148d783846299fc80a7d377baa6dca author James.Smart@Emulex.Com Thu, 15 Dec 2005 09:56:22 -0500 committer James Bottomley Thu, 15 Dec 2005 19:22:14 -0800 [SCSI] fix for fc transport recursion problem. In the scenario that a link was broken, the devloss timer for each rport was expire at roughly the same time, causing lots of "delete" workqueue items being queued. Depth is dependent upon the number of rports that were on the link. The rport target remove calls were calling flush_scheduled_work(), which would interrupt the stream, and start the next workqueue item, which did the same thing, and so on until recursion depth was large. This fix stops the recursion in the initial delete path, and pushes it off to a host-level work item that reaps the dead rports. Signed-off-by: James Bottomley commit 5b2db367a28c12e8dfd0b404d9ea35e948c5d7b3 tree 8ef2f739fc91acda0fb05797cb450b5789d79c59 parent d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 parent 7116317dc9148d783846299fc80a7d377baa6dca author Len Brown Thu, 15 Dec 2005 13:15:27 -0500 committer Len Brown Thu, 15 Dec 2005 13:15:27 -0500 Auto-update from upstream commit d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 tree f4418610996064cab63600ca093de65356dcdfde parent 927fe18397b3b1194a5b26b1d388d97e391e5fd2 parent acd9b7b4e08a3f0f48afa922d8e371414cf2d3b2 author Len Brown Wed, 14 Dec 2005 02:59:50 -0500 committer Len Brown Wed, 14 Dec 2005 02:59:50 -0500 Auto-update from upstream commit 927fe18397b3b1194a5b26b1d388d97e391e5fd2 tree f04da374e2f38adf85dd26a6accb73d95a90c912 parent e4f5c82a92c2a546a16af1614114eec19120e40a parent 1e483969930a82e16767884449f3a121a817ef00 author Len Brown Mon, 05 Dec 2005 17:08:40 -0500 committer Len Brown Mon, 05 Dec 2005 17:08:40 -0500 Pull 5165 into release branch commit 1e483969930a82e16767884449f3a121a817ef00 tree 9d110ed1c66f71762c88cbf5d83ea35467f46a14 parent 4c0335526c95d90a1d958e0059f40a5745fc7c5d author David Shaohua Li Thu, 01 Dec 2005 17:00:00 -0500 committer Len Brown Mon, 05 Dec 2005 17:00:37 -0500 [ACPI] correct earlier SMP deep C-states on HT patch http://bugzilla.kernel.org/show_bug.cgi?id=5165 Change polarity of test for PLVL2_UP flag. Skip promotion/demotion code when not needed. Signed-off-by: Shaohua Li Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown