commit f6fdd7d9c273bb2a20ab467cb57067494f932fa3 tree 4835ce2c366c8a5102d35592ddfdf9f22dd245c6 parent 7e71af49d46e4c25f17a2c8f53d62ffd14f01007 author Linus Torvalds Sat, 20 Aug 2005 18:51:29 -0700 committer Linus Torvalds Sat, 20 Aug 2005 18:51:29 -0700 Don't allow normal users to set idle IO priority It has all the normal priority inversion problems. Signed-off-by: Linus Torvalds commit 7e71af49d46e4c25f17a2c8f53d62ffd14f01007 tree a7724eb37fff88f707ebd3e59cc86b8e2b582f4e parent f93592ff4fa4a55aa7640d435fa93338e190294d author Patrick McHardy Sat, 20 Aug 2005 17:40:41 -0700 committer David S. Miller Sat, 20 Aug 2005 17:40:41 -0700 [NETFILTER]: Fix HW checksum handling in TCPMSS target Most importantly, remove bogus BUG() in receive path. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f93592ff4fa4a55aa7640d435fa93338e190294d tree 42ea51265582ba2b38089fd347cf3e16cfea7538 parent fd841326d73096ad79be9c3fa348f9ad04541cc2 author Patrick McHardy Sat, 20 Aug 2005 17:39:15 -0700 committer David S. Miller Sat, 20 Aug 2005 17:39:15 -0700 [NETFILTER]: Fix HW checksum handling in ECN target Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fd841326d73096ad79be9c3fa348f9ad04541cc2 tree 59a340d83e8381a249e379b70a26729fb8482825 parent a5ea169c9581553662bb79a1c8c98fed1ee84246 author Patrick McHardy Sat, 20 Aug 2005 17:38:40 -0700 committer David S. Miller Sat, 20 Aug 2005 17:38:40 -0700 [NETFILTER]: Fix ECN target TCP marking An incorrect check made it bail out before doing anything. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a5ea169c9581553662bb79a1c8c98fed1ee84246 tree 60a63546e3bca801d6cc77a39762b86811644f1d parent db873896d168217e213902c7163fda7ee798781b author Alexey Dobriyan Sun, 21 Aug 2005 01:08:36 +0400 committer Linus Torvalds Sat, 20 Aug 2005 14:30:50 -0700 [PATCH] freevxfs: fix breakage introduced by symlink fixes Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit db873896d168217e213902c7163fda7ee798781b tree d5bf83467cd473ab271a052f65e1095eb2bfbb87 parent 1eecd73cce4e11ba9d67ad767f92069cfba7b589 author Linus Torvalds Sat, 20 Aug 2005 13:20:01 -0700 committer Linus Torvalds Sat, 20 Aug 2005 13:20:01 -0700 befs: fix up missed follow_link declaration change We'd updated the prototype and the return value, but not the function declaration itself. commit 1eecd73cce4e11ba9d67ad767f92069cfba7b589 tree c72bdb38231e163df346ba118af821e4875c95bb parent 5e5ec10499a00bf4ce3440d5a9e1a5a176c5a640 author Andi Kleen Fri, 19 Aug 2005 06:56:40 +0200 committer Linus Torvalds Fri, 19 Aug 2005 19:18:47 -0700 [PATCH] x86_64: Fix race in TSC synchronization Plug a race in TSC synchronization We need to do tsc_sync_wait() before the CPU is set online to prevent multiple CPUs from doing it in parallel - which won't work because TSC sync has global unprotected state. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5e5ec10499a00bf4ce3440d5a9e1a5a176c5a640 tree dadd784393dd60f390c8c4dc6632f1da27bcee9a parent 916fa469ab2248d86473577dda72003df599879b author Andi Kleen Fri, 19 Aug 2005 06:56:04 +0200 committer Linus Torvalds Fri, 19 Aug 2005 19:18:47 -0700 [PATCH] x86_64: Don't print exceptions for ltrace Don't printk exceptions for ltrace Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 916fa469ab2248d86473577dda72003df599879b tree 248b432fcbc5a902f1f21ae6687de8c705500d9e parent b8d9598c41e999fb094d3811019248197c54274a parent 034ea6388a51f571b45ef1f0fa4ed4298691768e author Linus Torvalds Fri, 19 Aug 2005 19:15:57 -0700 committer Linus Torvalds Fri, 19 Aug 2005 19:15:57 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit b8d9598c41e999fb094d3811019248197c54274a tree f934dada0798c769331886481dd0e7538c2842fd parent 01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 parent 83c4e43722a2c8a8438b8d165047720fd36aaea4 author Linus Torvalds Fri, 19 Aug 2005 18:59:49 -0700 committer Linus Torvalds Fri, 19 Aug 2005 18:59:49 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 tree ae3c0190efa548d47e80e7225a8e8da0b2990317 parent cd3716ab40c6049479d29a74b29107fd7e0e1153 author Steve Dickson Fri, 19 Aug 2005 17:57:48 -0700 committer Linus Torvalds Fri, 19 Aug 2005 18:44:56 -0700 [PATCH] NFSv4: unbalanced BKL in nfs_atomic_lookup() Added missing unlock_kernel() to NFSv4 atomic lookup. Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd3716ab40c6049479d29a74b29107fd7e0e1153 tree 1b9fa4be58fda88d16d014bf85e460ee6db048ee parent 008b150a3c4d971cd65d02d107b8fcc860bc959c author Steven Rostedt Fri, 19 Aug 2005 17:57:46 -0700 committer Linus Torvalds Fri, 19 Aug 2005 18:44:56 -0700 [PATCH] Mobil Pentium 4 HT and the NMI I'm trying to get the nmi working with my laptop (IBM ThinkPad G41) and after debugging it a while, I found that the nmi code doesn't want to set it up for this particular CPU. Here I have: $ cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 15 model : 4 model name : Mobile Intel(R) Pentium(R) 4 CPU 3.33GHz stepping : 1 cpu MHz : 3320.084 cache size : 1024 KB physical id : 0 siblings : 2 core id : 0 cpu cores : 1 fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 3 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor ds_cpl est tm2 cid xtpr bogomips : 6642.39 processor : 1 vendor_id : GenuineIntel cpu family : 15 model : 4 model name : Mobile Intel(R) Pentium(R) 4 CPU 3.33GHz stepping : 1 cpu MHz : 3320.084 cache size : 1024 KB physical id : 0 siblings : 2 core id : 0 cpu cores : 1 fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 3 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor ds_cpl est tm2 cid xtpr bogomips : 6637.46 And the following code shows: $ cat linux-2.6.13-rc6/arch/i386/kernel/nmi.c [...] void setup_apic_nmi_watchdog (void) { switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15) return; setup_k7_watchdog(); break; case X86_VENDOR_INTEL: switch (boot_cpu_data.x86) { case 6: if (boot_cpu_data.x86_model > 0xd) return; setup_p6_watchdog(); break; case 15: if (boot_cpu_data.x86_model > 0x3) return; Here I get boot_cpu_data.x86_model == 0x4. So I decided to change it and reboot. I now seem to have a working NMI. So, unless there's something know to be bad about this processor and the NMI. I'm submitting the following patch. Signed-off-by: Steven Rostedt Acked-by: Zwane Mwaikambo Acked-by: Mikael Pettersson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 008b150a3c4d971cd65d02d107b8fcc860bc959c tree 8594c24dbb13dc253f41ef885a8ac899f0e434c1 parent cc314eef0128a807e50fa03baf2d0abc0647952c author Al Viro Sat, 20 Aug 2005 00:17:39 +0100 committer Linus Torvalds Fri, 19 Aug 2005 18:08:21 -0700 [PATCH] Fix up symlink function pointers This fixes up the symlink functions for the calling convention change: * afs, autofs4, befs, devfs, freevxfs, jffs2, jfs, ncpfs, procfs, smbfs, sysvfs, ufs, xfs - prototype change for ->follow_link() * befs, smbfs, xfs - same for ->put_link() Signed-off-by: Linus Torvalds commit cc314eef0128a807e50fa03baf2d0abc0647952c tree 8e38db1be28006894915273b3f3cb3beaa6efda3 parent 2fb1e3086df9b454538491fba8121298da37cd23 author Linus Torvalds Fri, 19 Aug 2005 18:02:56 -0700 committer Linus Torvalds Fri, 19 Aug 2005 18:02:56 -0700 Fix nasty ncpfs symlink handling bug. This bug could cause oopses and page state corruption, because ncpfs used the generic page-cache symlink handlign functions. But those functions only work if the page cache is guaranteed to be "stable", ie a page that was installed when the symlink walk was started has to still be installed in the page cache at the end of the walk. We could have fixed ncpfs to not use the generic helper routines, but it is in many ways much cleaner to instead improve on the symlink walking helper routines so that they don't require that absolute stability. We do this by allowing "follow_link()" to return a error-pointer as a cookie, which is fed back to the cleanup "put_link()" routine. This also simplifies NFS symlink handling. Signed-off-by: Linus Torvalds commit 2fb1e3086df9b454538491fba8121298da37cd23 tree d84587462e0378c5aa9c5581d6920d76242b8c65 parent 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 author Al Viro Fri, 19 Aug 2005 22:42:16 +0100 committer Linus Torvalds Fri, 19 Aug 2005 17:57:19 -0700 [PATCH] jffs2: fix symlink error handling The current calling conventions for ->follow_link() are already fairly complex. What we have is 1) you can return -error; then you must release nameidata yourself and ->put_link() will _not_ be called. 2) you can do nd_set_link(nd, ERR_PTR(-error)) and return 0 3) you can do nd_set_link(nd, path) and return 0 4) you can return 0 (after having moved nameidata yourself) jffs2 follow_link() is broken - it has an exit where it returns -EIO and leaks nameidata. Signed-off-by: Linus Torvalds commit 83c4e43722a2c8a8438b8d165047720fd36aaea4 tree c00a39d711f43853ac42ff5e93fe0826fa5388e5 parent a3f9985843b674cbcb58f39fab8416675e7ab842 author Al Viro Fri, 19 Aug 2005 15:56:37 -0700 committer David S. Miller Fri, 19 Aug 2005 15:56:37 -0700 [SPARC]: Fix weak aliases sparc_ksyms.c used to declare weak alias to several gcc intrinsics. It doesn't work with gcc4 anymore - it wants a declaration for the thing we are aliasing to and that's not going to happen for something like .mul, etc. Replaced with direct injection of weak alias on the assembler level - .weak followed by = ; that works on all gcc versions. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit a3f9985843b674cbcb58f39fab8416675e7ab842 tree aa869cd04ff618d018c5f39b7a3b0070d5e3957d parent 8d5290149ee1c6a4cea5f5146d64e2a0d48f4988 author David S. Miller Fri, 19 Aug 2005 15:55:33 -0700 committer David S. Miller Fri, 19 Aug 2005 15:55:33 -0700 [SPARC64]: Move kernel unaligned trap handlers into assembler file. GCC 4.x really dislikes the games we are playing in unaligned.c, and the cleanest way to fix this is to move things into assembler. Noted by Al Viro. Signed-off-by: David S. Miller commit 8d5290149ee1c6a4cea5f5146d64e2a0d48f4988 tree 6e61cf51aae72b81e3667e093893265c86febccc parent 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 author Ben Colline Fri, 19 Aug 2005 13:44:57 -0700 committer David S. Miller Fri, 19 Aug 2005 13:44:57 -0700 [SPARC]: Deal with glibc changing macro names in modpost.c GLIBC 2.3.4 and later changed the STT_REGISTER macro to STT_SPARC_REGISTER, so we need to cope with that somehow. Original patch from fabbione, reposted by Ben Collins. Signed-off-by: David S. Miller commit 034ea6388a51f571b45ef1f0fa4ed4298691768e tree eec3baca8d1c1f026474906a3db3fac311753b4a parent da6b2d01d6bd2e79fd4f7a08acd37dc4e8fcdce8 author David S. Miller Fri, 19 Aug 2005 12:57:31 -0700 committer David S. Miller Fri, 19 Aug 2005 12:57:31 -0700 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit da6b2d01d6bd2e79fd4f7a08acd37dc4e8fcdce8 tree 8cc7fcfa31f2d439545ff8d16ef188c1b1b7614c parent 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 author Michael Chan Fri, 19 Aug 2005 12:54:29 -0700 committer David S. Miller Fri, 19 Aug 2005 12:54:29 -0700 [TG3]: Fix SerDes detection A problem was reported by Grant Grundler on an HP rx8620 using IOX Core LAN partno(A7109-6) 5701 copper NIC. The tg3 driver mistakenly detects this NIC as having a SerDes PHY and link does not come up as a result. The problem was caused by an incorrectly programmed eeprom that set the NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER bit in the NIC_SRAM_DATA_CFG location. This patch will override the NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER bit if a valid PHY ID is read from the MII registers on older 570x chips where the MII interface is not used on SerDes chips. On newer chips such as the 5780 that use MII for both copper and SerDes, SerDes detection must rely on the eeprom. This patch will make the SerDes detection identical to versions 3.25 and older. Signed-off-by: Michael Chan Acked-by: Grant Grundler Signed-off-by: David S. Miller commit 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 tree afa2160e4b611f2991c09a6d6dc6079e47105605 parent 5fdf193b15a08f6c32ca4eb5913fa9be788e790e parent 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 author Linus Torvalds Thu, 18 Aug 2005 15:16:12 -0700 committer Linus Torvalds Thu, 18 Aug 2005 15:16:12 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 commit 5fdf193b15a08f6c32ca4eb5913fa9be788e790e tree 0747ab5547556b7955de7bf8fcfd0fab542e790d parent f3ed8b444781158c9c10f48a8eba6795ecec7023 parent 2ae2d77cfa424587014cb34a89eed0ff2149fd5c author Linus Torvalds Thu, 18 Aug 2005 14:58:21 -0700 committer Linus Torvalds Thu, 18 Aug 2005 14:58:21 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit f3ed8b444781158c9c10f48a8eba6795ecec7023 tree a0803f71abdcbaff0c7e78a507efe1cef36c2001 parent 6fc8b9e7c60d4a3d4d7f1189f74e37651f5610e6 parent 2cab224d1f6557e7014601f251d6a41982963e6b author Linus Torvalds Thu, 18 Aug 2005 14:57:53 -0700 committer Linus Torvalds Thu, 18 Aug 2005 14:57:53 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 6fc8b9e7c60d4a3d4d7f1189f74e37651f5610e6 tree e0a28a510f7655fa180f48caee683d2532ef7f75 parent cb94c62c252796f42bb83fe40960d12f3ea5a82a author Herbert Xu Thu, 18 Aug 2005 14:36:59 -0700 committer David S. Miller Thu, 18 Aug 2005 14:36:59 -0700 [IPCOMP]: Fix false smp_processor_id warning This patch fixes a false-positive from debug_smp_processor_id(). The processor ID is only used to look up crypto_tfm objects. Any processor ID is acceptable here as long as it is one that is iterated on by for_each_cpu(). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2cab224d1f6557e7014601f251d6a41982963e6b tree 24a234e496ba3425c5513adc377cdd77261fe609 parent 6be382ea0c767a81be0e7980400b9b18167b3261 author David S. Miller Thu, 18 Aug 2005 14:35:38 -0700 committer David S. Miller Thu, 18 Aug 2005 14:35:38 -0700 [SPARC64]: Fix 2 bugs in cpufreq drivers. 1) cpufreq wants frequenceis in KHZ not MHZ 2) provide ->get() method so curfreq node is created Signed-off-by: David S. Miller commit cb94c62c252796f42bb83fe40960d12f3ea5a82a tree 926fce041eb9983d37c5322ae5a13619a32087f9 parent 22783649568a28839c5a362f47da7819ecfcbb9f author Patrick McHardy Thu, 18 Aug 2005 14:05:44 -0700 committer David S. Miller Thu, 18 Aug 2005 14:05:44 -0700 [IPV4]: Fix DST leak in icmp_push_reply() Based upon a bug report and initial patch by Ollie Wild. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 22783649568a28839c5a362f47da7819ecfcbb9f tree 19065dd333e9e4dd456f08cb8426544b24ba479e parent 001dd250c1c68667a5c3b74979fa614e2edc9ceb author Ralf Baechle Thu, 18 Aug 2005 14:05:18 -0700 committer David S. Miller Thu, 18 Aug 2005 14:05:18 -0700 [NET]: Fix comment in loopback driver. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 001dd250c1c68667a5c3b74979fa614e2edc9ceb tree 95bafd6d3dbd0f7ca8bc0c41c2046a002e7c7660 parent 6be382ea0c767a81be0e7980400b9b18167b3261 author Jay Vosburgh Thu, 18 Aug 2005 14:04:51 -0700 committer David S. Miller Thu, 18 Aug 2005 14:04:51 -0700 [TOKENRING]: Use interrupt-safe locking with rif_lock. Change operations on rif_lock from spin_{un}lock_bh to spin_{un}lock_irq{save,restore} equivalents. Some of the rif_lock critical sections are called from interrupt context via tr_type_trans->tr_add_rif_info. The TR NIC drivers call tr_type_trans from their packet receive handlers. Signed-off-by: Jay Vosburgh Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 2ae2d77cfa424587014cb34a89eed0ff2149fd5c tree db587b806019155a84b7e1411f398863c5fdf81f parent 9ef9ac51cc5fa5f5811230b5fb242536b636ff47 author Ben Dooks Sat, 23 Jul 2005 17:29:38 +0100 committer Jeff Garzik Thu, 18 Aug 2005 16:59:14 -0400 [PATCH] DM9000 - incorrect ioctl() handling The DM9000 driver is responding to ioctl() calls it should not be. This can cause problems with the wireless tools incorrectly indentifying the device as wireless capable, and crashing under certain operations. This patch also moves the version printk() to the init call, so that you only get it once for multiple devices, and to show it is loaded if there are no defined dm9000s Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit 9ef9ac51cc5fa5f5811230b5fb242536b636ff47 tree 228175f622065b3683e2c2b94468210752004804 parent a4cf0761493495681d72dcc0b34efb86e94a5527 author Ben Dooks Sat, 23 Jul 2005 17:25:18 +0100 committer Jeff Garzik Thu, 18 Aug 2005 16:59:14 -0400 [PATCH] DM9000 - spinlock fixes Fix DM9000 driver usage of spinlocks, which mainly came to light when running a kernel with spinlock debugging. These come down to: 1) Un-initialised spin lock 2) Several cases of using spin_xxx(lock) and not spin_xxx(&lock) 3) move the locking around the phy reg for read/write to only keep the lock when actually reading or writing to the phy. Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit a4cf0761493495681d72dcc0b34efb86e94a5527 tree a053055cb2df4bbeaaed64a07421be492edd8088 parent 852ea22ab24df4c64c0211c3b6d6358eb0e759f9 author Pierre Ossman Mon, 04 Jul 2005 00:22:53 +0200 committer Jeff Garzik Thu, 18 Aug 2005 16:59:14 -0400 [PATCH] 8139cp - redetect link after suspend After suspend the driver needs to retest link status in case the cable has been inserted or removed during the suspend. Signed-off-by: Pierre Ossman Signed-off-by: Jeff Garzik commit 852ea22ab24df4c64c0211c3b6d6358eb0e759f9 tree 10a70ce5164898197c9bbd1339f98413d25e7e99 parent 6be382ea0c767a81be0e7980400b9b18167b3261 author Ralf Baechle Tue, 02 Aug 2005 11:01:27 +0100 committer Jeff Garzik Thu, 18 Aug 2005 16:59:14 -0400 [PATCH] IOC3 fixes - Using the right register clearly improves chances of getting the MII code and thus the driver working at all. - On startup check the media type before setting up duplex or we might spend the first 1.2s with a wrong duplex setting. - Get rid of whitespace lines. Signed-off-by: Jeff Garzik commit 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 tree d95ee287f89e9db0d450219e733833f95d3a2214 parent 2f09a7f4af131bf23c013ead89373deba1c7593c author Narendra Sankar Thu, 18 Aug 2005 22:30:35 +0200 committer Bartlomiej Zolnierkiewicz Thu, 18 Aug 2005 22:30:35 +0200 [PATCH] serverworks: add support for new southbridge IDE BCM5785 (HT1000) is a Opteron Southbridge from Serverworks/Broadcom that incorporates a single channel ATA100 IDE controller that is functionally identical to the Serverworks CSB6 IDE controller. This patch adds support for the new PCI device ID and also the support for this controller. Signed-off-by: Narendra Sankar Acked-by: Jeff Garzik commit 2f09a7f4af131bf23c013ead89373deba1c7593c tree b6175bf457e6903aaa6b007c3d8e2facbf20e4b7 parent b07e5eccaf512ae3209beae5cd2e3a27c92c300b author Matt Gillette Thu, 18 Aug 2005 22:27:07 +0200 committer Bartlomiej Zolnierkiewicz Thu, 18 Aug 2005 22:27:07 +0200 [PATCH] ide: add support for Netcell Revolution to pci-ide generic driver Adds support for Netcell Revolution to pci-ide generic driver by including it in the list of devices matched. Includes the Revolution in the list of simplex devices forced into DMA mode. Signed-off-by: Matt Gillette Cc: Bartlomiej Zolnierkiewicz Cc: Jeff Garzik Signed-off-by: Andrew Morton commit b07e5eccaf512ae3209beae5cd2e3a27c92c300b tree a5ea72daf021dc8c7b44eea063cfed4aaff22c58 parent 0ac72b351bdf29252e4181b07fa7feed8501b5d2 author Grant Coady Thu, 18 Aug 2005 22:19:55 +0200 committer Bartlomiej Zolnierkiewicz Thu, 18 Aug 2005 22:19:55 +0200 [PATCH] ide: fix PCI_DEVIEC_ID_APPLE_UNI_N_ATA spelling Signed-off-by: Grant Coady commit 0ac72b351bdf29252e4181b07fa7feed8501b5d2 tree bdf925efb7821b15575b2f79a34c459c1a41a0c0 parent c40d3d38a8f04fff4394c7323db239bce780db60 author Juha-Matti Tapio Thu, 18 Aug 2005 22:13:44 +0200 committer Bartlomiej Zolnierkiewicz Thu, 18 Aug 2005 22:13:44 +0200 [PATCH] ide: fix the BLK_DEV_IDEDMA_PCI dependency for drivers/ide/ppc/pmac.c drivers/ide/ppc/pmac.c uses symbols ide_build_sglist, __ide_dma_off_quietly, __ide_dma_on and __ide_dma_timeout when CONFIG_BLK_DEV_IDEDMA_PMAC is defined. The declarations for these symbols (in ide.h) depend on CONFIG_BLK_DEV_IDEDMA_PCI. There is a missing dependency for this in drivers/ide/Kconfig which causes drivers/ide/ppc/pmac.c to fail to build if CONFIG_BLK_DEV_IDEDMA_PMAC is selected but CONFIG_BLK_DEV_IDEDMA_PCI is not. Signed-off-by: Juha-Matti Tapio commit c40d3d38a8f04fff4394c7323db239bce780db60 tree 58fc485a9ca8d3a89221dd40ee2ae1c110b46598 parent 30d5b64b63fa69af31b2cba32e6d71d68526eec9 author Bartlomiej Zolnierkiewicz Thu, 18 Aug 2005 22:09:21 +0200 committer Bartlomiej Zolnierkiewicz Thu, 18 Aug 2005 22:09:21 +0200 [PATCH] ide-floppy: fix IDEFLOPPY_TICKS_DELAY * IDEFLOPPY_TICKS_DELAY assumed HZ == 100, fix it * increase the delay to 50ms (to match comment in the code) Thanks to Manfred Scherer for reporting the problem and testing the patch. commit 6be382ea0c767a81be0e7980400b9b18167b3261 tree 902e540aa7fef2b8804d0adf0d36104305039229 parent c6a3ea22af7a2ed36afa4672a86b3a86d604db33 author Andi Kleen Thu, 18 Aug 2005 11:24:27 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:59 -0700 [PATCH] x86: Remove obsolete get_cpu_vendor call Since early CPU identify is in this information is already available Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6a3ea22af7a2ed36afa4672a86b3a86d604db33 tree b61bf02bb31ad01a0fe734dc697dd0c9583e0441 parent 28cd1d17801774561c81a5be53bfb2d632aee2a2 author Matt Porter Thu, 18 Aug 2005 11:24:26 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:58 -0700 [PATCH] ppc32: Fix PPC440SP SRAM controller DCRs Fixes the incorrect DCR base value for the 440SP SRAM controller. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28cd1d17801774561c81a5be53bfb2d632aee2a2 tree d53e8817bbf738754a63b918517d7d5bea271635 parent 2eaa297ca234eb518673b28dd6f3715d4b292e09 author Matt Porter Thu, 18 Aug 2005 11:24:25 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:58 -0700 [PATCH] ppc32: fix ppc4xx stb03xxx dma build Fixes build on 4xx stb03xxx when general purpose dma engine support is enabled. Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2eaa297ca234eb518673b28dd6f3715d4b292e09 tree 00985e21a8c47a2c7d13125388d389449cb79c42 parent 718d8989bca49761daf65f77249b0067c40756b2 author Jeff Dike Thu, 18 Aug 2005 11:24:25 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:58 -0700 [PATCH] uml: fix a crash under screen Running UML inside a detached screen delivers SIGWINCH when UML is not expecting it. This patch ignores them. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718d8989bca49761daf65f77249b0067c40756b2 tree bc48f8c3596d8d7e8ca04102c23bd01096669a7e parent 024f474795af7a0d41bd6d60061d78bd66d13f56 author Al Viro Thu, 18 Aug 2005 11:24:23 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:58 -0700 [PATCH] uml: fix the x86_64 build asm/elf.h breaks the x86_64 build. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 024f474795af7a0d41bd6d60061d78bd66d13f56 tree 41dd079483713c7669b4c684686de3b701362d34 parent 6cbe9de7a4353d1a1b77887b5459ac5304c0984a author Matt Mackall Thu, 18 Aug 2005 11:24:19 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:58 -0700 [PATCH] Make RLIMIT_NICE ranges consistent with getpriority(2) As suggested by Michael Kerrisk , make RLIMIT_NICE consistent with getpriority before it becomes available in released glibc. Signed-off-by: Matt Mackall Acked-by: Ingo Molnar Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cbe9de7a4353d1a1b77887b5459ac5304c0984a tree 6b90e594dd1cc7a971d50a4620209c630aa9c0d0 parent d86c390ffbf5746df9a3cc2c5f7b75d27704580f author Michael Iatrou Thu, 18 Aug 2005 11:24:18 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:57 -0700 [PATCH] disable debug info in radeonfb old driver This driver spams the user. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d86c390ffbf5746df9a3cc2c5f7b75d27704580f tree b62520bb81f006ec2fb6f7b52ceede40893168a3 parent 9223214e8d757663f366133ba5f9b58aa6b28efb author Jan Kara Thu, 18 Aug 2005 11:24:17 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:57 -0700 [PATCH] reiserfs+acl+quota deadlock fix When i_acl_default is set to some error we do not hold the lock (hence we are not allowed to drop it and reacquire later). Signed-off-by: Jan Kara Cc: Jeff Mahoney Cc: Chris Mason Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9223214e8d757663f366133ba5f9b58aa6b28efb tree b3977e067dbf3b2679c16f77c9e9025c7f71f26f parent 60d7603a18a5c07252e7aa0b0e2424315195d4dc author NeilBrown Thu, 18 Aug 2005 11:24:16 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:57 -0700 [PATCH] md: make sure mddev->bitmap_offset gets cleared between array instantiations. ... otherwise we might try to load a bitmap from an array which hasn't one. The bug is that if you create an array with an internal bitmap, shut it down, and then create an array with the same md device, the md drive will assume it should have a bitmap too. As the array can be created with a different md device, it is mostly an inconvenience. I'm pretty sure there is no risk of data corruption. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60d7603a18a5c07252e7aa0b0e2424315195d4dc tree d75e45ad2899b49e3b9678b0d0378c200bfcb29a parent f2926b7953c5f23265c062992516fed6674105db author Robert Love Thu, 18 Aug 2005 11:24:14 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:57 -0700 [PATCH] SH64: inotify and ioprio syscalls Add inotify and ioprio syscall stubs to SH64. Signed-off-by: Robert Love Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2926b7953c5f23265c062992516fed6674105db tree 022b1bc9de27ee37a6f2e87e08c715b853cb4501 parent dc59250c6ebed099a9bc0a11298e2281dd896657 author Robert Love Thu, 18 Aug 2005 11:24:13 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:57 -0700 [PATCH] SH: inotify and ioprio syscalls Add inotify and ioprio syscall stubs to SH. Signed-off-by: Robert Love Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc59250c6ebed099a9bc0a11298e2281dd896657 tree 80c294437c0868d90abfa617d873370e6dbe6565 parent 412d582ec1dd59aab2353f8cb7e74f2c79cd20b9 author Chuck Lever Thu, 18 Aug 2005 11:24:12 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:57 -0700 [PATCH] NFS: Introduce the use of inode->i_lock to protect fields in nfsi Down the road we want to eliminate the use of the global kernel lock entirely from the NFS client. To do this, we need to protect the fields in the nfs_inode structure adequately. Start by serializing updates to the "cache_validity" field. Note this change addresses an SMP hang found by njw@osdl.org, where processes deadlock because nfs_end_data_update and nfs_revalidate_mapping update the "cache_validity" field without proper serialization. Test plan: Millions of fsx ops on SMP clients. Run Nick Wilson's breaknfs program on large SMP clients. Signed-off-by: Chuck Lever Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 412d582ec1dd59aab2353f8cb7e74f2c79cd20b9 tree 9088c5e29cbd4b33e907a7b5f9a950dd0dce36c1 parent 5529680981807b44abf3be30fb6d612ff04f68ff author Chuck Lever Thu, 18 Aug 2005 11:24:11 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:56 -0700 [PATCH] NFS: use atomic bitops to manipulate flags in nfsi->flags Introduce atomic bitops to manipulate the bits in the nfs_inode structure's "flags" field. Using bitops means we can use a generic wait_on_bit call instead of an ad hoc locking scheme in fs/nfs/inode.c, so we can remove the "nfs_i_wait" field from nfs_inode at the same time. The other new flags field will continue to use bitmask and logic AND and OR. This permits several flags to be set at the same time efficiently. The following patch adds a spin lock to protect these flags, and this spin lock will later cover other fields in the nfs_inode structure, amortizing the cost of using this type of serialization. Test plan: Millions of fsx ops on SMP clients. Signed-off-by: Chuck Lever Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5529680981807b44abf3be30fb6d612ff04f68ff tree 57da4e9135c0a85c1f8c6bc797250c0209420b51 parent 3c7bf1eaee1255315fc7c2c4c300295e556ef768 author Chuck Lever Thu, 18 Aug 2005 11:24:09 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:56 -0700 [PATCH] NFS: split nfsi->flags into two fields Certain bits in nfsi->flags can be manipulated with atomic bitops, and some are better manipulated via logical bitmask operations. This patch splits the flags field into two. The next patch introduces atomic bitops for one of the fields. Test plan: Millions of fsx ops on SMP clients. Signed-off-by: Chuck Lever Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c7bf1eaee1255315fc7c2c4c300295e556ef768 tree 38e82882670dc2773740ebb081e8e1201c577c13 parent 30d5b64b63fa69af31b2cba32e6d71d68526eec9 author Zwane Mwaikambo Thu, 18 Aug 2005 11:24:07 -0700 committer Linus Torvalds Thu, 18 Aug 2005 12:53:56 -0700 [PATCH] Update email addresses for Zwane Some folks have been emailing me and having trouble due to these stale addresses; Signed-off-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30d5b64b63fa69af31b2cba32e6d71d68526eec9 tree 16b55bd8beb2b56b459db5ef100b881243597f7a parent 518e6540831c69422faecceee8f964bd439ac9d0 author Jaroslav Kysela Thu, 18 Aug 2005 13:16:11 +0200 committer Linus Torvalds Thu, 18 Aug 2005 08:43:59 -0700 [PATCH] broken error path in drivers/pnp/card.c The error path in pnp_request_card_device() is broken (one variable is left initialized and the semaphore is not unlocked). This fixes it (and has been tested). Signed-off-by: Jaroslav Kysela Signed-off-by: Linus Torvalds commit 518e6540831c69422faecceee8f964bd439ac9d0 tree 0b31e27c6007adac51c8e6e3a832badc1d8e2a1a parent 099d44e869f1886b5eb02a5145ca97b5e4142e28 author Greg KH Wed, 17 Aug 2005 17:33:11 -0700 committer Linus Torvalds Wed, 17 Aug 2005 22:02:25 -0700 [PATCH] Fix manual binding infinite loop Fix for manual binding of drivers to devices. Problem is if you pass in a valid device id, but the driver refuses to bind. Infinite loop as write() tries to resubmit the data it just sent. Thanks to Michal Ostrowski for pointing the problem out. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 099d44e869f1886b5eb02a5145ca97b5e4142e28 tree 30db794ad875e8c919db0b05cb9e844202bda395 parent 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 parent 481d0374217f3fefaf98efbd8d21d73c138dd928 author Linus Torvalds Wed, 17 Aug 2005 14:56:22 -0700 committer Linus Torvalds Wed, 17 Aug 2005 14:56:22 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6 commit 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 tree aca4c35e2d288bbdf5248be241c52f67f820bb59 parent ac9af7cba9e642961bfdee1a1fac6060405597e5 author David Woodhouse Wed, 17 Aug 2005 11:36:35 +0100 committer Linus Torvalds Wed, 17 Aug 2005 14:55:37 -0700 [PATCH] Stop snd-powermac oopsing on non-pmac hardware. We shouldn't be assuming that ppc_md.feature_call will be present. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit ac9af7cba9e642961bfdee1a1fac6060405597e5 tree 5baf99a801a00137fefb158983c88180d36fa999 parent 75e8727fbb3749075b6df36be636a3045ed9d515 author Brian King Thu, 18 Aug 2005 07:32:18 +1000 committer Linus Torvalds Wed, 17 Aug 2005 14:41:22 -0700 [PATCH] ppc64: iommu vmerge fix This fixes a bug in the PPC64 iommu vmerge code which results in the potential for iommu_unmap_sg to go off unmapping more than it should. This was found on a test system which resulted in PCI bus errors due to PCI memory being unmapped while DMAs were still in progress. Signed-off-by: Brian King Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 75e8727fbb3749075b6df36be636a3045ed9d515 tree 1c2b9954c8c9d3f284defbd3910db6604e977e8d parent d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b parent 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 author Linus Torvalds Wed, 17 Aug 2005 13:09:38 -0700 committer Linus Torvalds Wed, 17 Aug 2005 13:09:38 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b tree 7887d95ec36087946a2c4b4c9ee0850c361fe22f parent c231c7db30faf93419fc22d680f74d816bea70e2 parent c149ec05dcd09d525e6778e339122827c7cd79b8 author Linus Torvalds Wed, 17 Aug 2005 13:08:17 -0700 committer Linus Torvalds Wed, 17 Aug 2005 13:08:17 -0700 Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit c231c7db30faf93419fc22d680f74d816bea70e2 tree 8a25999cb4b8c33841bd1969e3054c13bda3b394 parent 7974b1cc7879141962999e78a6fc9a136dc4479e author Linus Torvalds Wed, 17 Aug 2005 13:07:28 -0700 committer Linus Torvalds Wed, 17 Aug 2005 13:07:28 -0700 Revert unnecessary zlib_inflate/inftrees.c fix It turns out that empty distance code tables are not an error, and that a compressed block with only literals can validly have an empty table and should not be flagged as a data error. Some old versions of gzip had problems with this case, but it does not affect the zlib code in the kernel. Analysis and explanations thanks to Sergey Vlasov Signed-off-by: Linus Torvalds commit 7974b1cc7879141962999e78a6fc9a136dc4479e tree 716dd2f284007bea9b7e2e577770e895dc300874 parent c4f92dba97f4e3aa757500896f87001569f4604b parent 62ee914ef27fded9d1c5da41e1e05c3bd175c529 author Linus Torvalds Wed, 17 Aug 2005 13:02:22 -0700 committer Linus Torvalds Wed, 17 Aug 2005 13:02:22 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit c4f92dba97f4e3aa757500896f87001569f4604b tree 3af7efe2b1ae357ee151c1795dc60cfe801e8718 parent dd12f48d4e8774415b528d3991ae47c28f26e1ac author Steven Rostedt Wed, 17 Aug 2005 14:25:23 -0400 committer Linus Torvalds Wed, 17 Aug 2005 12:53:05 -0700 [PATCH] nfsd to unlock kernel before exiting The nfsd holds the big kernel lock upon exit, when it really shouldn't. Not to mention that this breaks Ingo's RT patch. This is a trivial fix to release the lock. Ingo, this patch also works with your kernel, and stops the problem with nfsd. Note, there's a "goto out;" where "out:" is right above svc_exit_thread. The point of the goto also holds the kernel_lock, so I don't see any problem here in releasing it. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit dd12f48d4e8774415b528d3991ae47c28f26e1ac tree d8083c3415d540adb7983bd23a80fb8420fa8414 parent ade6648b3b11a5d81f6f28135193ab6d85d621db author Bhavesh P. Davda Wed, 17 Aug 2005 12:26:33 -0600 committer Linus Torvalds Wed, 17 Aug 2005 12:52:04 -0700 [PATCH] NPTL signal delivery deadlock fix This bug is quite subtle and only happens in a very interesting situation where a real-time threaded process is in the middle of a coredump when someone whacks it with a SIGKILL. However, this deadlock leaves the system pretty hosed and you have to reboot to recover. Not good for real-time priority-preemption applications like our telephony application, with 90+ real-time (SCHED_FIFO and SCHED_RR) processes, many of them multi-threaded, interacting with each other for high volume call processing. Acked-by: Roland McGrath Signed-off-by: Linus Torvalds commit 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 tree 2d9066246fe198746762a609ac147a42fae0d4a6 parent bfd272b1ca1164382eabaa9986aad822adb91eb2 author Paul E. McKenney Wed, 17 Aug 2005 12:05:27 -0700 committer David S. Miller Wed, 17 Aug 2005 12:05:27 -0700 [DECNET]: Fix RCU race condition in dn_neigh_construct(). Signed-off-by: Paul E. McKenney Signed-off-by: David S. Miller commit bfd272b1ca1164382eabaa9986aad822adb91eb2 tree 1977975176717950d6389f41cc92832111e175ae parent 35d59efd105b3b7c1b5878dcc9d1749f41f9740f author Patrick McHardy Wed, 17 Aug 2005 12:04:22 -0700 committer David S. Miller Wed, 17 Aug 2005 12:04:22 -0700 [IPV6]: Fix SKB leak in ip6_input_finish() Changing it to how ip_input handles should fix it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 35d59efd105b3b7c1b5878dcc9d1749f41f9740f tree e96a9edb2df5b06e8ba59f0f8f685b0c1f09f840 parent 97077c4a9868fce8ac151512cde5d24fc1144f24 author Herbert Xu Wed, 17 Aug 2005 12:03:59 -0700 committer David S. Miller Wed, 17 Aug 2005 12:03:59 -0700 [TCP]: Fix bug #5070: kernel BUG at net/ipv4/tcp_output.c:864 1) We send out a normal sized packet with TSO on to start off. 2) ICMP is received indicating a smaller MTU. 3) We send the current sk_send_head which needs to be fragmented since it was created before the ICMP event. The first fragment is then sent out. At this point the remaining fragment is allocated by tcp_fragment. However, its size is padded to fit the L1 cache-line size therefore creating tail-room up to 124 bytes long. This fragment will also be sitting at sk_send_head. 4) tcp_sendmsg is called again and it stores data in the tail-room of of the fragment. 5) tcp_push_one is called by tcp_sendmsg which then calls tso_fragment since the packet as a whole exceeds the MTU. At this point we have a packet that has data in the head area being fed to tso_fragment which bombs out. My take on this is that we shouldn't ever call tcp_fragment on a TSO socket for a packet that is yet to be transmitted since this creates a packet on sk_send_head that cannot be extended. So here is a patch to change it so that tso_fragment is always used in this case. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 97077c4a9868fce8ac151512cde5d24fc1144f24 tree 600484f09f59126988fb153287bad7a27a511931 parent 2ad56496627630ebc99f06af5f81ca23e17e014e author Patrick McHardy Wed, 17 Aug 2005 12:03:32 -0700 committer David S. Miller Wed, 17 Aug 2005 12:03:32 -0700 [IPV6]: Fix raw socket hardware checksum failures When packets hit raw sockets the csum update isn't done yet, do it manually. Packets can also reach rawv6_rcv on the output path through ip6_call_ra_chain, in this case skb->ip_summed is CHECKSUM_NONE and this codepath isn't executed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c149ec05dcd09d525e6778e339122827c7cd79b8 tree becf81456da03332f732436a7604ac77fa94e891 parent 7f09d6f935aaa91f71fe64d64013ad3bd2a9d2f4 author Tony Luck Wed, 17 Aug 2005 10:24:17 -0700 committer Tony Luck Wed, 17 Aug 2005 10:24:17 -0700 [IA64] Updated tiger defconfig Signed-off-by: Tony Luck commit ade6648b3b11a5d81f6f28135193ab6d85d621db tree 1977975176717950d6389f41cc92832111e175ae parent 2ad56496627630ebc99f06af5f81ca23e17e014e parent fad87acaea7b0965fe91f0351fdd688fc9761cbe author Linus Torvalds Wed, 17 Aug 2005 08:21:00 -0700 committer Linus Torvalds Wed, 17 Aug 2005 08:21:00 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 62ee914ef27fded9d1c5da41e1e05c3bd175c529 tree 558a72af9ff5015c859f0630650871bdc141b9cd parent 22d8be866ee23bf3ad9fe867587eef5f4200bf84 author Dimitry Andric Wed, 17 Aug 2005 13:01:19 +0100 committer Russell King Wed, 17 Aug 2005 13:01:19 +0100 [ARM] 2850/1: Remove duplicate UART I/O mapping from s3c2410_iodesc Patch from Dimitry Andric This patch removes the initial UART I/O mapping from s3c2410_iodesc, since the same mapping is already done in the function s3c24xx_init_io in the file arch/arm/mach-s3c2410/cpu.c, through the s3c_iodesc array. I'm not sure if duplicate mappings do any harm, but it's simply redundant. Also, in s3c2440.c the UART I/O mapping is NOT done. Additionally, I put a comma behind the last mapping, to ease copy/pasting stuff around, and make the style consistent with s3c2440.c and other files. Signed-off-by: Dimitry Andric Signed-off-by: Russell King commit 22d8be866ee23bf3ad9fe867587eef5f4200bf84 tree 30776229759256eae069428e15423ce61faed970 parent 54738e82755f73080e779ba0c8052e232df24d78 author Sean Lee Wed, 17 Aug 2005 09:28:26 +0100 committer Russell King Wed, 17 Aug 2005 09:28:26 +0100 [ARM] 2852/1: Correct the mistake in arch/arm/mm/Kconfig file Patch from Sean Lee In the arch/arm/mm/Kconfig file, the CPU_DCACHE_WRITETHROUGH option is depend on the CPU_DISABLE_DCACHE, but the "Disable D-Cache" option is configured as CPU_DCACHE_DISABLE. The CPU_DISABLE_DCACHE should be CPU_DCACHE_DISABLE Signed-off-by: Sean Lee Signed-off-by: Russell King commit 2ad56496627630ebc99f06af5f81ca23e17e014e tree d5a7aecdd1d6d16f488a2b029ff55e5a132c8f1a parent da5ca008933b3b28303ba44d0be3372fbac7748b author Stephen Rothwell Wed, 17 Aug 2005 13:01:50 +1000 committer Linus Torvalds Tue, 16 Aug 2005 21:06:25 -0700 [PATCH] iSeries build with newer assemblers and compilers Paulus suggested that we put xLparMap in its own .c file so that we can generate a .s file to be included into head.S. This doesn't get around the problem of having it at a fixed address, but it makes it more palatable. It would be good if this could be included in 2.6.13 as it solves our build problems with various versions of binutils and gcc. In particular, it allows us to build an iSeries kernel on Debian unstable using their biarch compiler. This has been built and booted on iSeries and built for pSeries and g5. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit da5ca008933b3b28303ba44d0be3372fbac7748b tree 5c4809f497f113ffbf3883b6dda8a31b6616bd77 parent dc1d97e466c2836adebe5618759bfb5b35b3bc0a author Pete Zaitcev Tue, 16 Aug 2005 15:16:46 -0700 committer Linus Torvalds Tue, 16 Aug 2005 21:06:25 -0700 [PATCH] USB: usbmon: Copyrights and a typo Add copyright statements and fix a typo. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dc1d97e466c2836adebe5618759bfb5b35b3bc0a tree 89d4d85e4b4ab2652662bc5f9b65af8f08874ee0 parent 33a5c72432ef3e75dcf546bf41bcbfce697903ff author Ping Cheng Tue, 16 Aug 2005 15:16:32 -0700 committer Linus Torvalds Tue, 16 Aug 2005 21:06:25 -0700 [PATCH] USB: fix usb wacom tablet driver bug This patch fixes bug 4905 and a Cintiq 21UX bug. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 33a5c72432ef3e75dcf546bf41bcbfce697903ff tree ad2a10d8651ea18b0b54a8fa4657e70621a7418e parent 8cf4c19523b7694c88bba716d88fb659fa702411 author Jiri Slaby Tue, 16 Aug 2005 15:16:26 -0700 committer Linus Torvalds Tue, 16 Aug 2005 21:06:25 -0700 [PATCH] PCI: update documentation This removes very old functions from pci docs, which are no longer in the kernel. Signed-off-by: Jiri Slaby Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8cf4c19523b7694c88bba716d88fb659fa702411 tree 1ed9def7b77b9354032fd734a3dde43bea8b8e2d parent 4b47b0eefc37fe3bf6bffb4507c8b6df5b14348d author Kristen Accardi Tue, 16 Aug 2005 15:16:10 -0700 committer Linus Torvalds Tue, 16 Aug 2005 21:06:24 -0700 [PATCH] PCI Hotplug: new contact info Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4b47b0eefc37fe3bf6bffb4507c8b6df5b14348d tree a3f48593dc121e179d54e6ea90b67fa00e0e376a parent 4602b88d9743b5f20655de8078fb42e9fd25581f author Andrew Morton Tue, 16 Aug 2005 15:16:05 -0700 committer Linus Torvalds Tue, 16 Aug 2005 21:06:24 -0700 [PATCH] PCI: fix quirk-6700-fix.patch drivers/built-in.o(.text+0x32c3): In function `quirk_pcie_pxh': /usr/src/25/drivers/pci/quirks.c:1312: undefined reference to `disable_msi_mode' Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4602b88d9743b5f20655de8078fb42e9fd25581f tree 46fa501c25d46ef0691ee6891d928bb8def2e25e parent 208f3d6175cb17772c5af202fe12373f90894ff4 author Kristen Accardi Tue, 16 Aug 2005 15:15:58 -0700 committer Linus Torvalds Tue, 16 Aug 2005 21:06:24 -0700 [PATCH] PCI: 6700/6702PXH quirk On the 6700/6702 PXH part, a MSI may get corrupted if an ACPI hotplug driver and SHPC driver in MSI mode are used together. This patch will prevent MSI from being enabled for the SHPC as part of an early pci quirk, as well as on any pci device which sets the no_msi bit. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 208f3d6175cb17772c5af202fe12373f90894ff4 tree 86265a0aa2a8007e181e9edb279b2fab81b812ee parent 12aaa0855b39b5464db953fedf399fa91ee365ed author Maneesh Soni Tue, 16 Aug 2005 15:15:48 -0700 committer Linus Torvalds Tue, 16 Aug 2005 21:06:24 -0700 [PATCH] Driver core: potentially fix use after free in class_device_attr_show This moves the code to free devt_attr from class_device_del() to class_dev_release() which is called after the last reference to the corresponding kobject() is gone. This allows us to keep the devt_attr alive while the corresponding sysfs file is open. Signed-off-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fad87acaea7b0965fe91f0351fdd688fc9761cbe tree c14fefeeb50683accf0a34e4785155f0edad030d parent c8ac37746489f05a32a958b048f29ae45487e81e author Patrick McHardy Tue, 16 Aug 2005 21:03:41 -0700 committer David S. Miller Tue, 16 Aug 2005 21:03:41 -0700 [IPV6]: Fix SKB leak in ip6_input_finish() Changing it to how ip_input handles should fix it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c8ac37746489f05a32a958b048f29ae45487e81e tree c1d326c64fca3f5902438160b7b28e178318c8be parent 793245eeb97bd28e363f2b0f2e766fdbff0c9619 author Herbert Xu Tue, 16 Aug 2005 20:43:40 -0700 committer David S. Miller Tue, 16 Aug 2005 20:43:40 -0700 [TCP]: Fix bug #5070: kernel BUG at net/ipv4/tcp_output.c:864 1) We send out a normal sized packet with TSO on to start off. 2) ICMP is received indicating a smaller MTU. 3) We send the current sk_send_head which needs to be fragmented since it was created before the ICMP event. The first fragment is then sent out. At this point the remaining fragment is allocated by tcp_fragment. However, its size is padded to fit the L1 cache-line size therefore creating tail-room up to 124 bytes long. This fragment will also be sitting at sk_send_head. 4) tcp_sendmsg is called again and it stores data in the tail-room of of the fragment. 5) tcp_push_one is called by tcp_sendmsg which then calls tso_fragment since the packet as a whole exceeds the MTU. At this point we have a packet that has data in the head area being fed to tso_fragment which bombs out. My take on this is that we shouldn't ever call tcp_fragment on a TSO socket for a packet that is yet to be transmitted since this creates a packet on sk_send_head that cannot be extended. So here is a patch to change it so that tso_fragment is always used in this case. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 793245eeb97bd28e363f2b0f2e766fdbff0c9619 tree 07518e44dce1c9b41d714df1482d4106c67f1459 parent 12aaa0855b39b5464db953fedf399fa91ee365ed author Patrick McHardy Tue, 16 Aug 2005 20:39:38 -0700 committer David S. Miller Tue, 16 Aug 2005 20:39:38 -0700 [IPV6]: Fix raw socket hardware checksum failures When packets hit raw sockets the csum update isn't done yet, do it manually. Packets can also reach rawv6_rcv on the output path through ip6_call_ra_chain, in this case skb->ip_summed is CHECKSUM_NONE and this codepath isn't executed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7f09d6f935aaa91f71fe64d64013ad3bd2a9d2f4 tree ed11f03be87d8352ea8e6c618bca5bba945ab5a5 parent 7b1a843f4630867c1d686885e7af94eac137e888 author Peter Chubb Tue, 16 Aug 2005 17:27:00 -0700 committer Tony Luck Tue, 16 Aug 2005 17:34:31 -0700 [IA64] Updated zx1 defconfig Just `make oldconfig' doesn't help for the zx1 defconfig --- because we need the MPT Fusion drivers, which are picked up as not selected. Tested on HP ZX2000 and ZX2600. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit 7b1a843f4630867c1d686885e7af94eac137e888 tree 6f7bbc84fc15b1b6a343fcbaf0911b34c7f134fa parent 71841b8fe7dd8caffd07482cbed4a99874bfbb70 author Greg Edwards Tue, 16 Aug 2005 13:06:00 -0700 committer Tony Luck Tue, 16 Aug 2005 16:26:36 -0700 [IA64] Refresh arch/ia64/configs/sn2_defconfig. Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit 71841b8fe7dd8caffd07482cbed4a99874bfbb70 tree 6c8ae7c675cd99214d088c34909b5a19501f1c2c parent f7001e8f1fa5369ee24f58255726a04a2019e4bd author Keith Owens Sat, 30 Jul 2005 17:52:00 -0700 committer Tony Luck Tue, 16 Aug 2005 15:33:26 -0700 [IA64] Initialize some spinlocks Some IA64 spinlocks are not being initialized, make it so. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 12aaa0855b39b5464db953fedf399fa91ee365ed tree d202ce6d6529fe23e950e24cd04b4d562f28705e parent 5153f7e6dba37390902c8fd3edc9a8cc19358ece author Zachary Amsden Tue, 16 Aug 2005 12:05:09 -0700 committer Linus Torvalds Tue, 16 Aug 2005 12:18:01 -0700 [PATCH] i386 / desc_empty macro is incorrect Chuck Ebbert noticed that the desc_empty macro is incorrect. Fix it. Thankfully, this is not used as a security check, but it can falsely overwrite TLS segments with carefully chosen base / limits. I do not believe this is an issue in practice, but it is a kernel bug. Signed-off-by: Zachary Amsden Signed-off-by: Chris Wright [ x86-64 had the same problem, and the same fix. Linus ] Signed-off-by: Linus Torvalds commit 5153f7e6dba37390902c8fd3edc9a8cc19358ece tree 1f47f0e30fd93a7d867382bc478d501436371e1a parent ca27ea487ea10bd22459dbc367cf263f1e8d5228 parent 2d610b80e954045ccfc27558f84e482709e5e5b7 author Linus Torvalds Tue, 16 Aug 2005 12:12:30 -0700 committer Linus Torvalds Tue, 16 Aug 2005 12:12:30 -0700 Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6 commit 481d0374217f3fefaf98efbd8d21d73c138dd928 tree a48cb569e03337a3ae0ffed5b30bc60c991fb498 parent cf59001235c5a36f3e3701bd593a78cf955a4242 author Anton Altaparmakov Tue, 16 Aug 2005 19:42:56 +0100 committer Anton Altaparmakov Tue, 16 Aug 2005 19:42:56 +0100 NTFS: Complete the previous fix for the unset device when mapping buffers for mft record writing. I had missed the writepage based mft record write code path. Signed-off-by: Anton Altaparmakov commit f7001e8f1fa5369ee24f58255726a04a2019e4bd tree 1bbdd233ad0cf2e0adb4eb04f22b7bfa59a43494 parent 85f265d887d2389376f1caa191e9682085feb76e parent cf59001235c5a36f3e3701bd593a78cf955a4242 author Tony Luck Tue, 16 Aug 2005 11:29:57 -0700 committer Tony Luck Tue, 16 Aug 2005 11:29:57 -0700 Auto-update from upstream commit ca27ea487ea10bd22459dbc367cf263f1e8d5228 tree d5d5ef369455685e99481dc1c4ba049f00d0332e parent cf59001235c5a36f3e3701bd593a78cf955a4242 parent fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 author Linus Torvalds Tue, 16 Aug 2005 09:43:13 -0700 committer Linus Torvalds Tue, 16 Aug 2005 09:43:13 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit cf59001235c5a36f3e3701bd593a78cf955a4242 tree 8bd67575a8f3640f29dec67a424b7488582b8cd8 parent 65e4308d2500e7daf60c3dccc202c61ffb066c63 parent e74589ac250e463973361774a90fee2c9d71da02 author Linus Torvalds Tue, 16 Aug 2005 09:31:28 -0700 committer Linus Torvalds Tue, 16 Aug 2005 09:31:28 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6 commit 65e4308d2500e7daf60c3dccc202c61ffb066c63 tree 76a2e00004f645d09b2e59b485fb2aea0af45234 parent 367ae3cd74bdc2ad32d71293427fec570b14ddcd author Trond Myklebust Tue, 16 Aug 2005 11:49:44 -0400 committer Linus Torvalds Tue, 16 Aug 2005 09:30:58 -0700 [PATCH] NFS: Ensure we always update inode->i_mode when doing O_EXCL creates When the client performs an exclusive create and opens the file for writing, a Netapp filer will first create the file using the mode 01777. It does this since an NFSv3/v4 exclusive create cannot immediately set the mode bits. The 01777 mode then gets put into the inode->i_mode. After the file creation is successful, we then do a setattr to change the mode to the correct value (as per the NFS spec). The problem is that nfs_refresh_inode() no longer updates inode->i_mode, so the latter retains the 01777 mode. A bit later, the VFS notices this, and calls remove_suid(). This of course now resets the file mode to inode->i_mode & 0777. Hey presto, the file mode on the server is now magically changed to 0777. Duh... Fixes http://bugzilla.linux-nfs.org/show_bug.cgi?id=32 Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 367ae3cd74bdc2ad32d71293427fec570b14ddcd tree c349e1884b336659738c286d7a8a3cb6afda714c parent 58fcb8df0bf663bb6b8f46cd3010bfe8d13d97cf author John Hawkes Tue, 16 Aug 2005 17:59:20 +1000 committer Linus Torvalds Tue, 16 Aug 2005 08:54:00 -0700 [PATCH] fix for ia64 sched-domains code Fix for ia64 sched domain building triggered by cpuset code. Acked-by: Nick Piggin Acked-by: Dinakar Guniguntala Signed-off-by: Linus Torvalds commit 58fcb8df0bf663bb6b8f46cd3010bfe8d13d97cf tree 24edbecfb5875cf6c602b1fd5126c7dfce9ae127 parent 75cd968ab251ac84dd3a5dc252af7036dc4a64f4 author Trond Myklebust Wed, 10 Aug 2005 18:15:12 -0400 committer Linus Torvalds Tue, 16 Aug 2005 08:52:11 -0700 [PATCH] NFS: Ensure ACL xdr code doesn't overflow. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit e74589ac250e463973361774a90fee2c9d71da02 tree d66e3870b1ad88cd174628411fd8e85a6af0fdc4 parent 3edea4833a1efcd43e1dff082bc8001fdfe74b34 author Anton Altaparmakov Tue, 16 Aug 2005 16:38:28 +0100 committer Anton Altaparmakov Tue, 16 Aug 2005 16:38:28 +0100 NTFS: Fix bug in mft record writing where we forgot to set the device in the buffers when mapping them after the VM had discarded them. Thanks to Martin MOKREJŠ for the bug report. Signed-off-by: Anton Altaparmakov commit 75cd968ab251ac84dd3a5dc252af7036dc4a64f4 tree 4c8114135ba89878af4cc0240e776fbd68c976c0 parent 3edea4833a1efcd43e1dff082bc8001fdfe74b34 author Linus Torvalds Mon, 15 Aug 2005 17:40:46 -0700 committer Linus Torvalds Mon, 15 Aug 2005 17:40:46 -0700 um: fix __pa/__va macro expansion problem Proper parentheses around arguments needed, especially as the macros use a high-precedence cast operator on the argument. commit 85f265d887d2389376f1caa191e9682085feb76e tree f6e847d33a15c7f6cbbf57fa2f575f4356c0db4d parent fc464476aa8356f7aae8787d9b8c14aa15d166eb author Christoph Hellwig Tue, 09 Aug 2005 13:38:00 -0700 committer Tony Luck Mon, 15 Aug 2005 15:03:12 -0700 [IA64] update CONFIG_PCI description The current one doesn't even make sense anymore on i386 where it apparently came from. Follow-up wordsmithing by Matthew Wilcox and Tony Luck. Signed-off-by: Christoph Hellwig Signed-off-by: Tony Luck commit fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 tree 6e412d032cca4ddb50b8628b4bbecea120d316a7 parent b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae parent 3edea4833a1efcd43e1dff082bc8001fdfe74b34 author Len Brown Mon, 15 Aug 2005 16:02:50 -0400 committer Len Brown Mon, 15 Aug 2005 16:02:50 -0400 Merge ../from-linus commit b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae tree bce3d877276819174962796954c424c0a09be188 parent 2ba84684e8cf6f980e4e95a2300f53a505eb794e parent 30e332f3307e9f7718490a706e5ce99f0d3a7b26 author Len Brown Mon, 15 Aug 2005 15:49:00 -0400 committer Len Brown Mon, 15 Aug 2005 15:49:00 -0400 Merge ../to-linus-stable/ commit 30e332f3307e9f7718490a706e5ce99f0d3a7b26 tree 39054cfaf058a369f2b75bd89265e83522c02b49 parent d4ab025b73a2d10548e17765eb76f3b7351dc611 author Luming Yu Fri, 12 Aug 2005 00:31:00 -0400 committer Len Brown Mon, 15 Aug 2005 15:46:58 -0400 [ACPI] re-enable platform-specific hotkey drivers by default When both platform-specific and generic drivers exist, enable generic over-ride with "acpi_generic_hotkey". http://bugzilla.kernel.org/show_bug.cgi?id=4953 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 54738e82755f73080e779ba0c8052e232df24d78 tree a00032413cc28576443fbcf5eaeb915bb23dcceb parent d93742f5a73c3dff641732c029836170f86392d2 author Richard Purdie Mon, 15 Aug 2005 20:42:32 +0100 committer Russell King Mon, 15 Aug 2005 20:42:32 +0100 [PATCH] ARM: 2851/1: Fix NWFPE extended precision exception handling Patch from Richard Purdie The exception handling code fails to compile if the extended precision mode is enabled. This patch fixes those compile errors and also stops _quiet functions from incorrectly raising exceptions. Reported-by: Ralph Siemsen Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 3edea4833a1efcd43e1dff082bc8001fdfe74b34 tree 9c1fcbc1bf513123f9612153c40582d2ff464d07 parent 6bd49341f2806168c877e12cefca77b93437bac2 author Antonino A. Daplas Mon, 15 Aug 2005 21:29:11 +0800 committer Linus Torvalds Mon, 15 Aug 2005 09:59:39 -0700 [PATCH] intelfb/fbdev: Save info->flags in a local variable Reported by: Pavel Kysilka (Bugzilla Bug 5059) The intelfb driver does not keep resolution set with fbset after switching to anot console and back. Steps to reproduce: initial options: tty1,tty2 - 1024x768-60 1) tty1 - fbset after booting (1024x768-60) 2) tty1 - fbset 800x600-100 tty1: 800x600-100 3) swith to tty2, swith to tty1 tty1: 1024x768-60 (the same resolution as default from kernel booting) This bug is caused by intelfb unintentionally destroying info->flags in set_par(). Therefore the flag, FBINFO_MISC_USEREVENT used to notify fbcon of a mode change was cleared causing the above problem. This bug though is not intelfb specific, as other drivers may also be affected. The fix is to save info->flags in a local variable before calling any of the driver hooks. A more definitive fix (for post 2.6.13) is to separate info->flags into one that is set by the driver and another that is set by core fbdev/fbcon. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 6bd49341f2806168c877e12cefca77b93437bac2 tree f7cd5a855842f061b48dd42338a0ab7f61bc360f parent 89204c40a03346cd951e698d854105db4cfedc28 author Sylvain Meyer Mon, 15 Aug 2005 21:27:13 +0800 committer Linus Torvalds Mon, 15 Aug 2005 09:53:34 -0700 [PATCH] intelfb: Do not ioremap entire graphics aperture Reported by: Pavel Kysilka (Bugzilla Bug 4738) modprobe of intelfb results in the following error message: intelfb: Framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G chi intelfb: Version 0.9.2 ACPI: PCI Interrupt 0000:00:02.0[A] -> GSI 16 (level, low) -> IRQ 16 allocation failed: out of vmalloc space - use vmalloc= to increase siz intelfb: Cannot remap FB region. This will fail if the graphics aperture size is greater than 128 MB. Fix is to ioremap only from the beginning of graphics aperture to the end of the used framebuffer memory. Signed-off-by: Sylvain Meyer Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 89204c40a03346cd951e698d854105db4cfedc28 tree 02f52e02f9f11c13c9859217755b043fcf0bbc30 parent 0bf955ce98cb3cf40e20d0cc435299eb76e8819e author John McCutchan Mon, 15 Aug 2005 12:13:28 -0400 committer Linus Torvalds Mon, 15 Aug 2005 09:50:31 -0700 [PATCH] inotify: add MOVE_SELF event This adds a MOVE_SELF event to inotify. It is sent whenever the inode you are watching is moved. We need this event so that we can catch something like this: - app1: watch /etc/mtab - app2: cp /etc/mtab /tmp/mtab-work mv /etc/mtab /etc/mtab~ mv /tmp/mtab-work /etc/mtab app1 still thinks it's watching /etc/mtab but it's actually watching /etc/mtab~. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit 0bf955ce98cb3cf40e20d0cc435299eb76e8819e tree c1fd8207f7d7b3e1db7d0f28ffae88f0dc205083 parent 2ba84684e8cf6f980e4e95a2300f53a505eb794e author Robert Love Mon, 15 Aug 2005 12:27:54 -0400 committer Linus Torvalds Mon, 15 Aug 2005 09:48:31 -0700 [PATCH] inotify: fix idr_get_new_above usage We are saving the wrong thing in ->last_wd. We want the wd, not the return value. Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit d93742f5a73c3dff641732c029836170f86392d2 tree d69f618b5b5b7889ae02dd15160338834756cb91 parent 498de0cc5ea3009af762dc968a46d6f5df96b67a author Russell King Mon, 15 Aug 2005 16:53:38 +0100 committer Russell King Mon, 15 Aug 2005 16:53:38 +0100 [ARM] Remove extraneous whitespace introduced in previous ARMv6 patch Signed-off-by: Russell King commit 498de0cc5ea3009af762dc968a46d6f5df96b67a tree 3f9161c9c2f31c35dff635f3c4b75deaaf910c77 parent 2ba84684e8cf6f980e4e95a2300f53a505eb794e author Robert Love Mon, 15 Aug 2005 10:57:08 +0100 committer Russell King Mon, 15 Aug 2005 10:57:08 +0100 [ARM] Add syscall stubs for inotify and ioprio system calls Signed-off-by: Robert Love Signed-off-by: Russell King commit 2ba84684e8cf6f980e4e95a2300f53a505eb794e tree f8a746aca3ca8aeb832d83e9297f2ffe636082c6 parent b4b08e581fac8e0ba9ae348bdc13246c9798c99e author Linus Torvalds Sun, 14 Aug 2005 18:21:30 -0700 committer Linus Torvalds Sun, 14 Aug 2005 18:21:30 -0700 Revert PCIBIOS_MIN_IO changes for 2.6.13 This reverts commits 71db63acff69618b3d9d3114bd061938150e146b [PATCH] increase PCIBIOS_MIN_IO on x86 and 0b2bfb4e7ff61f286676867c3508569bea6fbf7a ACPI: increase PCIBIOS_MIN_IO on x86 since Lukas Sandströ reports that this breaks his on-board nvidia audio. We should re-visit this later. For now we revert the change Signed-off-by: Linus Torvalds commit b4b08e581fac8e0ba9ae348bdc13246c9798c99e tree b09ea9a12a65f0a03fa7a15b0e661756913a0262 parent 27876d02b30aa34bb1ad35b81ccc40c174282f31 author Linus Torvalds Sun, 14 Aug 2005 15:43:39 -0700 committer Linus Torvalds Sun, 14 Aug 2005 15:43:39 -0700 Revert "dc395x: Fix support for highmem" It introduces a repeatable oops in the driver, which is a bigger problem than the patch tries to solve. From the original description: Author: Jamie Lenehan Date: Thu Mar 3 14:41:40 2005 +0200 [PATCH] dc395x: Fix support for highmem From: Guennadi Liakhovetski Removes the page_to_virt and maps sg lists dynamically. This makes the driver work with highmem pages. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Jamie Lenehan Signed-off-by: James Bottomley Signed-off-by: Guennadi Liakhovetski Signed-off-by: Linus Torvalds commit 27876d02b30aa34bb1ad35b81ccc40c174282f31 tree ba07379df3c12bd963363d0a3205a201688a5e4d parent d024709deb4997aced6140a62e8ee82b10666c5f author Steve French Sun, 14 Aug 2005 16:55:23 -0500 committer Linus Torvalds Sun, 14 Aug 2005 15:27:24 -0700 [PATCH] CIFS: Fix path name conversion for long filenames Fix path name conversion for long filenames when mapchars mount option was specified at mount time. Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds commit d024709deb4997aced6140a62e8ee82b10666c5f tree c383ee45809d28079b4dcd554f9953509c57da1b parent 1b0a74d1c002320d5488333dd9c72126af1aab02 author Steve French Sun, 14 Aug 2005 16:55:23 -0500 committer Linus Torvalds Sun, 14 Aug 2005 15:27:24 -0700 [PATCH] CIFS: Fix missing entries in search results Fix missing entries in search results when very long file names and more than 50 (or so) of such long search entries in the directory. FindNext could send corrupt last byte of resume name when resume key was a few hundred bytes long file name or longer. Fixes Samba Bug # 2932 Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds commit 1b0a74d1c002320d5488333dd9c72126af1aab02 tree 78eed6efb9cb5d97abe75cf793e5bd866381c6f9 parent f73bc8cae3481adc4188a5f34a89025c10133b0a author Jan Kara Sat, 13 Aug 2005 13:15:34 +0200 committer Linus Torvalds Sat, 13 Aug 2005 21:54:13 -0700 [PATCH] Fix error handling in reiserfs Initialize key object ID in inode so that we don't try to remove the inode when we fail on some checks even before we manage to allocate something. Signed-off-by: Jan Kara Signed-off-by: Linus Torvalds commit f73bc8cae3481adc4188a5f34a89025c10133b0a tree 794793d9d6d67cfaa55d141083527297bcc14bd1 parent 4bb82551e165f887448f6f61055d7bcd90aefa2a author Paul Mundt Sat, 13 Aug 2005 20:28:06 +0300 committer Linus Torvalds Sat, 13 Aug 2005 14:23:39 -0700 [PATCH] sh: Make _syscall6() do the right thing. There was a rather silly and embarrassing typo in the sh _syscall6(). For the syscall ABI we have the trapa value specified as 0x10 + number of arguments, this was being set incorrectly in the _syscall6() case which ended up causing some problems for users. Signed-off-by: Paul Mundt Signed-off-by: Linus Torvalds commit 4bb82551e165f887448f6f61055d7bcd90aefa2a tree e52389322e063c5b784ead6ec314503f7646c765 parent 2da5bf80f754e28cc153362e5ed1edaa9740897a author Linus Torvalds Sat, 13 Aug 2005 14:22:59 -0700 committer Linus Torvalds Sat, 13 Aug 2005 14:22:59 -0700 Fix up mmap of /dev/kmem This leaves the issue of whether we should deprecate the whole thing (or if we should check the whole mmap range, for that matter) open. Just do the minimal fix for now. commit fc464476aa8356f7aae8787d9b8c14aa15d166eb tree 99068df8e33177f2376f953486a235a8b0215e69 parent 691241315116b962f2161e6190f1678cc65bbe26 parent 2da5bf80f754e28cc153362e5ed1edaa9740897a author Tony Luck Fri, 12 Aug 2005 15:13:06 -0700 committer Tony Luck Fri, 12 Aug 2005 15:13:06 -0700 Auto-update from upstream commit 2da5bf80f754e28cc153362e5ed1edaa9740897a tree 875b37dea35256467ff21fbd1bd6ebd9e4c72ebf parent 63788ea9245688772d13b979bea05bd72b239aad author Evgeniy Polyakov Fri, 12 Aug 2005 11:46:22 -0700 committer Linus Torvalds Fri, 12 Aug 2005 12:55:02 -0700 [PATCH] w1: more debug level decrease. Do not spam syslog each 10 seconds when there is nothing on the wire. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 63788ea9245688772d13b979bea05bd72b239aad tree 13f00cc8f6da1ed6c583947652bbedb2a0e27693 parent 349188f66da2fd88f8cb2407763051d8e136c9aa parent d7b9dfc8ea43936e6e8eec3040dcf4f110563868 author Linus Torvalds Fri, 12 Aug 2005 09:22:34 -0700 committer Linus Torvalds Fri, 12 Aug 2005 09:22:34 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 349188f66da2fd88f8cb2407763051d8e136c9aa tree d14fad61cfc65cd4fc2ee74e8f5753500379c8b6 parent 7d69fa6266770eeb6317eddd46b64456e8a515bf author Eric W. Biederman Thu, 11 Aug 2005 22:26:25 -0600 committer Linus Torvalds Fri, 12 Aug 2005 09:22:04 -0700 [PATCH] x86_64: Fix apicid versus cpu# confusion. Oops. I knew I didn't have the physical versus logical cpu identifiers right when I generated that patch. It's not nearly as bad as I feared at the time though. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit d7b9dfc8ea43936e6e8eec3040dcf4f110563868 tree fb2bf6e88cab914fb1f11d4143bb72dd953d35a8 parent 53fb95d3c14290fd6ee808b221e35493f096246f author Matt Mackall Thu, 11 Aug 2005 19:28:05 -0700 committer David S. Miller Thu, 11 Aug 2005 19:28:05 -0700 [NETPOLL]: remove unused variable Remove unused variable Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 53fb95d3c14290fd6ee808b221e35493f096246f tree 146c31c79bbc66d8fde3afa5ae37a04b63041eba parent 2652076507b662fc88ba16c27b59c7bdd9ccd956 author Matt Mackall Thu, 11 Aug 2005 19:27:43 -0700 committer David S. Miller Thu, 11 Aug 2005 19:27:43 -0700 [NETPOLL]: fix initialization/NAPI race This fixes a race during initialization with the NAPI softirq processing by using an RCU approach. This race was discovered when refill_skbs() was added to the setup code. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 2652076507b662fc88ba16c27b59c7bdd9ccd956 tree dff28a2168431921a607062f56faebe9fd1b0fd0 parent 0db1d6fc1ea051af49ebe03c503d23996a7c5bbb author Ingo Molnar Thu, 11 Aug 2005 19:26:42 -0700 committer David S. Miller Thu, 11 Aug 2005 19:26:42 -0700 [NETPOLL]: pre-fill skb pool we could do one thing (see the patch below): i think it would be useful to fill up the netlogging skb queue straight at initialization time. Especially if netpoll is used for dumping alone, the system might not be in a situation to fill up the queue at the point of crash, so better be a bit more prepared and keep the pipeline filled. [ I've modified this to be called earlier - mpm ] Signed-off-by: Ingo Molnar Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 0db1d6fc1ea051af49ebe03c503d23996a7c5bbb tree 6afab02002a46b045a3b8769342ad277402f0d95 parent f0d3459d0722782c7d9d0e35a1ed0815e75fcde5 author Matt Mackall Thu, 11 Aug 2005 19:25:54 -0700 committer David S. Miller Thu, 11 Aug 2005 19:25:54 -0700 [NETPOLL]: add retry timeout Add limited retry logic to netpoll_send_skb Each time we attempt to send, decrement our per-device retry counter. On every successful send, we reset the counter. We delay 50us between attempts with up to 20000 retries for a total of 1 second. After we've exhausted our retries, subsequent failed attempts will try only once until reset by success. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit f0d3459d0722782c7d9d0e35a1ed0815e75fcde5 tree 84c07d42090b81705d23103bda29b0c186fffa49 parent 6b0b31572985c2e64f7216c798766302fb782281 author Matt Mackall Thu, 11 Aug 2005 19:25:11 -0700 committer David S. Miller Thu, 11 Aug 2005 19:25:11 -0700 [NETPOLL]: netpoll_send_skb simplify Minor netpoll_send_skb restructuring Restructure to avoid confusing goto and move some bits out of the retry loop. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 6b0b31572985c2e64f7216c798766302fb782281 tree 29617ffbfff1ce75fc73dbcd8dcb4c3fdbb49f06 parent a636e1357911afdea7c8344ee65f78d36caf3c16 author Matt Mackall Thu, 11 Aug 2005 19:24:33 -0700 committer David S. Miller Thu, 11 Aug 2005 19:24:33 -0700 [NETPOLL]: e1000 netpoll tweak Suggested by Steven Rostedt, matches his patch included in e100. Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit a636e1357911afdea7c8344ee65f78d36caf3c16 tree 644495567b6a66d29116e0831a96198d82d788e9 parent 11513128bb66b0b09d5d0df069b58afdb01752a2 author Jeff Moyer Thu, 11 Aug 2005 19:23:50 -0700 committer David S. Miller Thu, 11 Aug 2005 19:23:50 -0700 [NETPOLL]: deadlock bugfix This fixes an obvious deadlock in the netpoll code. netpoll_rx takes the npinfo->rx_lock. netpoll_rx is also the only caller of arp_reply (through __netpoll_rx). As such, it is not necessary to take this lock. Signed-off-by: Jeff Moyer Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit 11513128bb66b0b09d5d0df069b58afdb01752a2 tree 2c6cb83eb623e7e0ac997f8cb21c0998fe082b2e parent a0d3bea3cf6c7c1b53a46432bd490b5dc784ca42 author Jeff Moyer Thu, 11 Aug 2005 19:23:04 -0700 committer David S. Miller Thu, 11 Aug 2005 19:23:04 -0700 [NETPOLL]: rx_flags bugfix Initialize npinfo->rx_flags. The way it stands now, this will have random garbage, and so will incur a locking penalty even when an rx_hook isn't registered and we are not active in the netpoll polling code. Signed-off-by: Jeff Moyer Signed-off-by: Matt Mackall Signed-off-by: David S. Miller commit a0d3bea3cf6c7c1b53a46432bd490b5dc784ca42 tree 2c0f1d9e4c94f6b4052ca7f51442a3f5922124e3 parent 7d69fa6266770eeb6317eddd46b64456e8a515bf author Alexey Dobriyan Thu, 11 Aug 2005 16:05:50 -0700 committer David S. Miller Thu, 11 Aug 2005 16:05:50 -0700 [NET]: Make skb->protocol __be16 There are many instances of skb->protocol = htons(ETH_P_*); skb->protocol = __constant_htons(ETH_P_*); and skb->protocol = *_type_trans(...); Most of *_type_trans() are already endian-annotated, so, let's shift attention on other warnings. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 7d69fa6266770eeb6317eddd46b64456e8a515bf tree e70456aa61c6f82bc8409c1fea65124e6eec3f57 parent b5da623ae9be680ea59f268eeb339f0acb2d88c4 author Johannes Stezenbach Thu, 11 Aug 2005 11:54:24 +0200 committer Linus Torvalds Thu, 11 Aug 2005 10:08:59 -0700 [PATCH] Fix DVB URL Signed-off-by: Johannes Stezenbach Signed-off-by: Linus Torvalds commit 691241315116b962f2161e6190f1678cc65bbe26 tree 2687b0820416b0ebd3c8e45b7bc66d4442b181ed parent 1c53e4357ec72d6114c58d20c26d00a904f55da3 parent 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 author Tony Luck Thu, 11 Aug 2005 09:43:50 -0700 committer Tony Luck Thu, 11 Aug 2005 09:43:50 -0700 pull perfmon context load into release tree commit b5da623ae9be680ea59f268eeb339f0acb2d88c4 tree b41844950a11240000d74fb65ce9c4ea82ef2a17 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author Herbert Xu Wed, 10 Aug 2005 18:32:36 -0700 committer David S. Miller Wed, 10 Aug 2005 18:32:36 -0700 [TCP]: Adjust {p,f}ackets_out correctly in tcp_retransmit_skb() Well I've only found one potential cause for the assertion failure in tcp_mark_head_lost. First of all, this can only occur if cnt > 1 since tp->packets_out is never zero here. If it did hit zero we'd have much bigger problems. So cnt is equal to fackets_out - reordering. Normally fackets_out is less than packets_out. The only reason I've found that might cause fackets_out to exceed packets_out is if tcp_fragment is called from tcp_retransmit_skb with a TSO skb and the current MSS is greater than the MSS stored in the TSO skb. This might occur as the result of an expiring dst entry. In that case, packets_out may decrease (line 1380-1381 in tcp_output.c). However, fackets_out is unchanged which means that it may in fact exceed packets_out. Previously tcp_retrans_try_collapse was the only place where packets_out can go down and it takes care of this by decrementing fackets_out. So we should make sure that fackets_out is reduced by an appropriate amount here as well. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 tree efa54f2f19580f330ae71c3a9476d2261b172142 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author stephane.eranian@hp.com Thu, 28 Jul 2005 05:18:00 -0700 committer Tony Luck Wed, 10 Aug 2005 16:21:58 -0700 [IA64] fix perfmon context load The PFM_LOAD_CONTEXT may fail silently and cause a session to remain reserved even though it should not. This can happen when the commands succeeds in reserving the session but fails when it actually tries to attach to the load_pid. In that case, the command has failed but will return 0. More importantly, the session will remain reserved. This patch fixes the problem. Signed-off-by: Signed-off-by: Tony Luck commit 1c53e4357ec72d6114c58d20c26d00a904f55da3 tree 3448b43b8f781e42245f58fcddb11b8c933f0ff1 parent bc68552faad0e134eb22281343d5ae5a4873fa80 author Kenji Kaneshige Wed, 10 Aug 2005 02:49:00 -0700 committer Tony Luck Wed, 10 Aug 2005 15:42:41 -0700 [IA64] fix iosapic_remove build error for !HOTPLUG This patch removes the following stupid compile error that happens when CONFIG_HOTPLUG is not defined on ia64. arch/ia64/kernel/built-in.o(.text+0x712): In function `acpi_unregister_ioapic': : undefined reference to `iosapic_remove' Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit bc68552faad0e134eb22281343d5ae5a4873fa80 tree 2dc4d4339e6012049be4c1c548d226d78fc1090a parent 0893dd327ffacb83dcca9033d2891d57b4024d6b parent 001ab02a8c04f0b4dc773c474da698ad7405ae68 author Linus Torvalds Wed, 10 Aug 2005 12:21:25 -0700 committer Linus Torvalds Wed, 10 Aug 2005 12:21:25 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 0893dd327ffacb83dcca9033d2891d57b4024d6b tree dc7f614efa213e5939b32ef71209d832b28256fc parent 606867443764edac5a2c542f2fa0a12ef7a7c7fd parent 42517438f9c1011a03e49a542cba32ac5a80dd8e author Linus Torvalds Wed, 10 Aug 2005 11:56:19 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:56:19 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 606867443764edac5a2c542f2fa0a12ef7a7c7fd tree 61110afaef5e8be41be940815a8bd6065e32c5da parent 3462b925414a146d4c2252de97d20f89218d1ffb author James Bottomley Wed, 10 Aug 2005 11:29:15 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:55:19 -0700 [PATCH] remove name length check in a workqueue We have a chek in there to make sure that the name won't overflow task_struct.comm[], but it's triggering for scsi with lots of HBAs, only scsi is using single-threaded workqueues which don't append the "/%d" anyway. All too hard. Just kill the BUG_ON. Cc: Ingo Molnar Signed-off-by: Andrew Morton [ kthread_create() uses vsnprintf() and limits the thing, so no actual overflow can actually happen regardless ] Signed-off-by: Linus Torvalds commit 001ab02a8c04f0b4dc773c474da698ad7405ae68 tree 760d373edc5603ff3e3b05d274236e35bffdebdd parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Steven Whitehouse Wed, 10 Aug 2005 11:32:57 -0700 committer David S. Miller Wed, 10 Aug 2005 11:32:57 -0700 [DECNET]: Use sk_stream_error function rather than DECnet's own Signed-off-by: Steven Whitehouse Signed-off-by: David S. Miller commit 3462b925414a146d4c2252de97d20f89218d1ffb tree 69c56646fdcb3092cb064b9a7fa88a1ed3936789 parent e62b8b2bc73b2433239a2ac394c2fafd50c43d9e author Pierre Ossman Mon, 11 Jul 2005 14:19:35 +0200 committer Linus Torvalds Wed, 10 Aug 2005 11:08:56 -0700 [PATCH] wbsd version bump Even though the changes are minor for the next release an increasing version number simplifies my support issues. Signed-off-by: Pierre Ossman Signed-off-by: Linus Torvalds commit e62b8b2bc73b2433239a2ac394c2fafd50c43d9e tree 37905efc6ff5a7c451cc37b4697eed2cdb820992 parent 70679ee34f244499cf1c6775647895123eb1a326 author Benjamin Herrenschmidt Wed, 10 Aug 2005 11:12:09 +0200 committer Linus Torvalds Wed, 10 Aug 2005 11:07:40 -0700 [PATCH] ppc64: Fix Fan control for new PowerMac G5 2.7GHz machines The workaround for broken device-tree that prevents fan control from working on recent G5 models need to be "enabled" for machines with revision 0x37 of the bridge in addition to machines with revision 0x35. Signed-off-by: Geoff Levand Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 70679ee34f244499cf1c6775647895123eb1a326 tree f072c008a577663f2e4f3385ed854e0dceaffe34 parent 435d444a532af652ba8bdfd4db4424982bea2f69 parent b876386ee47e3ac9375a36e9107b8bd32e0599fc author Linus Torvalds Wed, 10 Aug 2005 11:05:56 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:05:56 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp commit 435d444a532af652ba8bdfd4db4424982bea2f69 tree a6baaf42fe41c22fd08b8ffab612194bb1c7004a parent 22d0def9d09111513f5a8d38583210620f97d710 parent 484ae6bd9506488089c33784eff35b190fa80e03 author Linus Torvalds Wed, 10 Aug 2005 11:05:28 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:05:28 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 22d0def9d09111513f5a8d38583210620f97d710 tree b17c0fd6d98afc0af6920d18e096e7ab814189de parent c0438174e8272d23fe43a5d3f23d777f5b412e87 author Alexander Nyberg Wed, 10 Aug 2005 10:11:36 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:03:02 -0700 [PATCH] ns558 list handling fix Need to use list_for_entry_safe(), as we're removing items during the traversal. list_for_each_entry() uses the first ptr also as an iterator, if you kfree() it slab takes it, might poison it and then you try to use it to iterate to the next object in list. Cc: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0438174e8272d23fe43a5d3f23d777f5b412e87 tree 5c7ef2706004c7ebf620f5f347b914e57f3b093d parent 48d28fd55e7fd349fb16a50244379b4da3a4943c author Ralf Baechle DL5RB Wed, 10 Aug 2005 10:03:20 -0700 committer Linus Torvalds Wed, 10 Aug 2005 11:03:02 -0700 [PATCH] 6pack persistence fix Fix the p-persistence CSMA algorithm which in simplex mode was starting with a slottime delay before doing anything else as if there was carrier collision resulting in bad performance on simplex links. Signed-off-by: Ralf Baechle DL5RB Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42517438f9c1011a03e49a542cba32ac5a80dd8e tree e754cb76bd2db916dd38e6ba5f65a2e56a701b84 parent fae009847c9ea3d668bbee21ce1d76764eca5039 author Tejun Heo Wed, 10 Aug 2005 13:38:27 -0400 committer Jeff Garzik Wed, 10 Aug 2005 13:38:27 -0400 libata: fix EH-related lockup by properly cleaning EH command list Yet another hack due to the fact that libata is the only user of SCSI's ->eh_strategy_handler() hook. commit fae009847c9ea3d668bbee21ce1d76764eca5039 tree b0272cf5f64ce8e0e7ae15018e9318ac7b0ad732 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Tejun Heo Sun, 07 Aug 2005 14:53:40 +0900 committer Jeff Garzik Wed, 10 Aug 2005 13:34:58 -0400 [PATCH] sata: fix sata_sx4 dma_prep to not use sg->length sata_sx4 directly references sg->length to calculate total_len in pdc20621_dma_prep(). This is incorrect as dma_map_sg() could have merged multiple sg's into one and, in such case, sg->length doesn't reflect true size of the entry. This patch makes it use sg_dma_len(sg). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 48d28fd55e7fd349fb16a50244379b4da3a4943c tree a6239419973b87c0560de36ab9e11516d45173e8 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 parent 5bb8345db8f2aef367e0fddf99a42b7a6029b31f author Linus Torvalds Wed, 10 Aug 2005 09:36:02 -0700 committer Linus Torvalds Wed, 10 Aug 2005 09:36:02 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 commit 2d610b80e954045ccfc27558f84e482709e5e5b7 tree 840b3bb52adba07b6f1e4ddf2beb5ad5df480486 parent 8a9cd6d676728792aaee31f30015d284acd154a3 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Dave Kleikamp Wed, 10 Aug 2005 11:15:13 -0500 committer Dave Kleikamp Wed, 10 Aug 2005 11:15:13 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit 8a9cd6d676728792aaee31f30015d284acd154a3 tree 7e40b3b1802b1a86603f7ac6bf74906775a2956e parent a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e author Dave Kleikamp Wed, 10 Aug 2005 11:14:39 -0500 committer Dave Kleikamp Wed, 10 Aug 2005 11:14:39 -0500 JFS: Fix race in txLock TxAnchor.anon_list is protected by jfsTxnLock (TXN_LOCK), but there was a place in txLock() that was removing an entry from the list without holding the spinlock. Signed-off-by: Dave Kleikamp commit 484ae6bd9506488089c33784eff35b190fa80e03 tree 389ab376598b97db693d8a8f468ecdb174a0a881 parent c59d071d4a32e1c45cac6d47f5b59ec36a9a997b author Ben Dooks Wed, 10 Aug 2005 16:45:14 +0100 committer Russell King Wed, 10 Aug 2005 16:45:14 +0100 [PATCH] ARM: 2849/1: S3C24XX - USB host update (2848/1) Patch from Ben Dooks Rename the s3c2410_report_oc() to s3c2410_usb_report_oc() as this is an usb specific function. Change port power on the usb-simtec implementation to only power up the output if both are set, as per the usb 1.1 specification Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c59d071d4a32e1c45cac6d47f5b59ec36a9a997b tree 671909f7778b7ec30bfe821c85b5c4802e7f2479 parent 8d3722667762af1490db18ba927386d3be89a32b author Ben Dooks Wed, 10 Aug 2005 16:45:14 +0100 committer Russell King Wed, 10 Aug 2005 16:45:14 +0100 [PATCH] ARM: 2847/1: S3C24XX - Documentation for USB OHCI host Patch from Ben Dooks Documentation for the in-built OHCI host controller and the support for it in Linux. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 8d3722667762af1490db18ba927386d3be89a32b tree 5b96d7b33c40b1abca00030f0b3b42bed5567b0c parent 6626a7076d39f0a18156cdd97d4e2cbef91ad701 author Nicolas Pitre Wed, 10 Aug 2005 16:45:13 +0100 committer Russell King Wed, 10 Aug 2005 16:45:13 +0100 [PATCH] ARM: 2846/1: proper handling of CKEN for pxafb Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 6626a7076d39f0a18156cdd97d4e2cbef91ad701 tree 13909ea6ae009b9b418cf3302baebe1baaa0dbd4 parent 1b9749e7f15bf2db19f5d201f88401c7517910b7 author Russell King Wed, 10 Aug 2005 16:18:35 +0100 committer Russell King Wed, 10 Aug 2005 16:18:35 +0100 [ARM] Control v6 'global' bit via Linux PTE entries Unfortunately, we can't use the "user" bit in the page tables to control whether a page table entry is "global" or "asid" specific, since the vector page is mapped as "user" accessible but is not process specific. Therefore, give direct control of the ARMv6 "nG" (not global) bit to the mm layers. Signed-off-by: Russell King commit 1b9749e7f15bf2db19f5d201f88401c7517910b7 tree 43654821aa73118f73f0e98e40bfb470f089e96d parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Russell King Wed, 10 Aug 2005 16:15:32 +0100 committer Russell King Wed, 10 Aug 2005 16:15:32 +0100 [ARM] Use #defined constants for manipulating v6 hardware PTE bits Signed-off-by: Russell King commit b876386ee47e3ac9375a36e9107b8bd32e0599fc tree 9bd30de345a0bf8260db1e3edbb657dc46bbe1e9 parent 3c4ee4e2520775896efc6ab850c4c27971fbcf2a author Russell King Wed, 10 Aug 2005 14:52:52 +0100 committer Russell King Wed, 10 Aug 2005 14:52:52 +0100 [ARM SMP] Clear the exclusive monitor on ARMv6 CPUs on context switch Ensure that the exclusive monitor is cleared on context switch with ARMv6 CPUs. Signed-off-by: Russell King commit 3c4ee4e2520775896efc6ab850c4c27971fbcf2a tree 0b1512bf41bde9d89c4076b305df7ceab9db2465 parent 86b3786078d63242d3194ffc58ae8dae1d1bbef3 author Russell King Wed, 10 Aug 2005 14:41:45 +0100 committer Russell King Wed, 10 Aug 2005 14:41:45 +0100 [ARM SMP] Only enable V6K instructions on V6 MP core CPUs Signed-off-by: Russell King commit 86b3786078d63242d3194ffc58ae8dae1d1bbef3 tree 518f62158f0923573decb8f072ac7282fb7575cb parent aeb3f76350e78aba90653b563de6677b442d21d6 author Christoph Lameter Tue, 09 Aug 2005 19:59:21 -0700 committer Linus Torvalds Tue, 09 Aug 2005 20:21:31 -0700 [PATCH] Fix ide-disk.c oops caused by hwif == NULL 1. Move hwif_to_node to ide.h 2. Use hwif_to_node in ide-disk.c Signed-off-by: Christoph Lameter Signed-off-by: Linus Torvalds commit aeb3f76350e78aba90653b563de6677b442d21d6 tree 1978eafdc5a50528652bf5b8e950afe03af5d5d2 parent e179d8b0552e2fdb45c6022c589af945f8cbecbe author Michael Krufky Tue, 09 Aug 2005 17:48:54 -0700 committer Linus Torvalds Tue, 09 Aug 2005 17:59:52 -0700 [PATCH] DVB: lgdt330x frontend: some bug fixes & add lgdt3303 support This patch removes the tda9887 stuff from lgdt330x.c. It's experimental code which wasn't supposed to leak out and we don't want it in 2.6.13. Signed-off-by: Michael Krufky Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e179d8b0552e2fdb45c6022c589af945f8cbecbe tree 55bea91fb428a84682928b40e0765ce96903df20 parent dc9352a42c6de578c932313448257cf246b2b75f author Michael Krufky Tue, 09 Aug 2005 17:48:54 -0700 committer Linus Torvalds Tue, 09 Aug 2005 17:59:52 -0700 [PATCH] dvb: lgdt330x frontend: trivial text cleanups Two trivial text changes in Kconfig and lgdt330x.c Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc9352a42c6de578c932313448257cf246b2b75f tree cc0a26be95e1a93e675bbe40dd7528db7ed2baa1 parent a7df26da158ad64d56cc32934aa38a07d03a6fc9 author Markus Lidel Tue, 09 Aug 2005 14:30:57 -0700 committer Linus Torvalds Tue, 09 Aug 2005 17:59:52 -0700 [PATCH] I2O: added pci_request_regions() before using the controller Added pci_request_regions() before using the controller to avoid duplicate usage of the I2O controller when the dpt_i2o driver and I2O subsystem is loaded at the same time. Signed-off-by: Markus Lidel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7df26da158ad64d56cc32934aa38a07d03a6fc9 tree be7cf42be9e84df58332c16db91526f818da020b parent 68e681e87faa142bde356aeefe619c42275ac98e parent fb573856b2d82926b36ed059899d883474a3b9eb author Linus Torvalds Tue, 09 Aug 2005 16:03:19 -0700 committer Linus Torvalds Tue, 09 Aug 2005 16:03:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 68e681e87faa142bde356aeefe619c42275ac98e tree 2eba703e7d672238cccf8b9090f4be6b4dcbeb1b parent 25f13053651569bd0c87927ff49d07d9225feadb parent 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 author Linus Torvalds Tue, 09 Aug 2005 16:02:15 -0700 committer Linus Torvalds Tue, 09 Aug 2005 16:02:15 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 25f13053651569bd0c87927ff49d07d9225feadb tree 12d9b6a690c314be5b2e3f8423c5a82618b96508 parent db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 parent d64d3873721cfe870d49d73c3744f06260779ce7 author Linus Torvalds Tue, 09 Aug 2005 16:00:05 -0700 committer Linus Torvalds Tue, 09 Aug 2005 16:00:05 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d64d3873721cfe870d49d73c3744f06260779ce7 tree b49a930e65ed4f30b4f8f2aac4ddb08c41bc4b79 parent 3501466941347f0e1992b2672affb3feb92925fd author Andrew Morton Tue, 09 Aug 2005 15:29:19 -0700 committer David S. Miller Tue, 09 Aug 2005 15:29:19 -0700 [NET]: Fix memory leak in sys_{send,recv}msg() w/compat From: Dave Johnson sendmsg()/recvmsg() syscalls from o32/n32 apps to a 64bit kernel will cause a kernel memory leak if iov_len > UIO_FASTIOV for each syscall! This is because both sys_sendmsg() and verify_compat_iovec() kmalloc a new iovec structure. Only the one from sys_sendmsg() is free'ed. I wrote a simple test program to confirm this after identifying the problem: http://davej.org/programs/testsendmsg.c Note that the below fix will break solaris_sendmsg()/solaris_recvmsg() as it also calls verify_compat_iovec() but expects it to malloc internally. [ I fixed that. -DaveM ] Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3501466941347f0e1992b2672affb3feb92925fd tree 4db1741d4400b704609d495c68728c962ea3982a parent 00dd1e433967872f3997a45d5adf35056fdf2f56 author David S. Miller Tue, 09 Aug 2005 14:57:12 -0700 committer David S. Miller Tue, 09 Aug 2005 14:57:12 -0700 [SUNRPC]: Fix nsec --> usec conversion. We need to divide, not multiply. While we're here, use NSEC_PER_USEC instead of a magic constant. Based upon a report from Josip Loncaric and a patch by Andrew Morton. Signed-off-by: David S. Miller commit 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 tree 62b5387a79777395af440f0fcb601eb692feb2aa parent 4875ccdb304775e9fd830f644643a1513357e043 author David S. Miller Tue, 09 Aug 2005 14:43:14 -0700 committer David S. Miller Tue, 09 Aug 2005 14:43:14 -0700 [SPARC]: envctrl: ERR_PTR() --> PTR_ERR() Fix thinko in Christoph's changes. Signed-off-by: David S. Miller commit 4875ccdb304775e9fd830f644643a1513357e043 tree 8467c7e0f6066613a850945cd3e54993d42bbe3e parent bc2406684b5929cea5d40b9cc4fd872816956779 author Christoph Hellwig Tue, 09 Aug 2005 14:39:10 -0700 committer David S. Miller Tue, 09 Aug 2005 14:39:10 -0700 [SPARC]: remove ifdef CONFIG_PCI from envctrl.c The driver already depends on CONFIG_PCI in Kconfig. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit bc2406684b5929cea5d40b9cc4fd872816956779 tree e7e9f356f14b5353f8b07273948beb1eef0ec8f9 parent 218b29e0c3995ee15782de55ad1dd74cce1a728d author Christoph Hellwig Tue, 09 Aug 2005 13:32:25 -0700 committer David S. Miller Tue, 09 Aug 2005 13:32:25 -0700 [SPARC]: Use kthread infrastructure in bbc_envctrl Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 218b29e0c3995ee15782de55ad1dd74cce1a728d tree e734f30f6123ae2b4e3ba545e9017d6d0498b3e7 parent 00dd1e433967872f3997a45d5adf35056fdf2f56 author Christoph Hellwig Tue, 09 Aug 2005 12:30:07 -0700 committer David S. Miller Tue, 09 Aug 2005 12:30:07 -0700 [SPARC]: Use kthread infrastructure in envctrl envctrl currently uses very odd ways to stop a thread, using various things that should be exposed to drivers at all. This patch (which is untested as I don't have sparc hardware) switches it to use the proper kthread infrastructure. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 tree fcecd11c14fd6e95b1dc7daba899c64bbee25ded parent 36d2f5a18205dfc2fac1e3541d324ce186f418cb author Markus Lidel Tue, 09 Aug 2005 10:08:03 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] i2o: remove new configuration API Remove new configuration API from i2o_config The API-patch is still available from the I2O website (which is mentioned in the kernel config now). It is removed because it creates a new binary sysfs-attribute, which doesn't have the limitiation of 4k. Expect for the Adaptec controllers, which has a limitation in the hardware this attribute doesn't make sense anywhere else. Until the sysfs API provides an attribute which doesn't buffer (like firmware) and let access to at least 64k blocks i provide a separate patch... (akpm: basically, this API was introduced post-2.6.12 and Markus wants to pull it out before 2.6.13). Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36d2f5a18205dfc2fac1e3541d324ce186f418cb tree 6eeb91fa4e58d12183fc7645f0308f51b07db690 parent 311c46273f0e8b140d4cc68e13128cbc22114807 author Kumar Gala Tue, 09 Aug 2005 10:08:02 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] cpm_uart: needs some love to compile with GCC4.0.1 Fixed problems so we can build with gcc-4.0.1 Signed-off-by: Peter Schaefer-Hutter Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 311c46273f0e8b140d4cc68e13128cbc22114807 tree 1e8b4dfe3417e6f8b896d8d6856a72d6d65299b6 parent 3077a260e9f316b611436b1506eec9cc5c4f8aa6 author Kumar Gala Tue, 09 Aug 2005 10:08:00 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] cpm_uart: Fix dpram allocation and non-console uarts * Makes dpram allocations work * Makes non-console UART work on both 8xx and 82xx * Fixed whitespace in files that were touched Signed-off-by: Vitaly Bordug Signed-off-by: Pantelis Antoniou Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3077a260e9f316b611436b1506eec9cc5c4f8aa6 tree 43b7d5faa5f204904c713c463015792d9ff56b01 parent a242b44da6feb604c4c659b78f63dedb69b2d4a3 author Paul Jackson Tue, 09 Aug 2005 10:07:59 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:22 -0700 [PATCH] cpuset release ABBA deadlock fix Fix possible cpuset_sem ABBA deadlock if 'notify_on_release' set. For a particular usage pattern, creating and destroying cpusets fairly frequently using notify_on_release, on a very large system, this deadlock can be seen every few days. If you are not using the cpuset notify_on_release feature, you will never see this deadlock. The existing code, on task exit (or cpuset deletion) did: get cpuset_sem if cpuset marked notify_on_release and is ready to release: compute cpuset path relative to /dev/cpuset mount point call_usermodehelper() forks /sbin/cpuset_release_agent with path drop cpuset_sem Unfortunately, the fork in call_usermodehelper can allocate memory, and allocating memory can require cpuset_sem, if the mems_generation values changed in the interim. This results in an ABBA deadlock, trying to obtain cpuset_sem when it is already held by the current task. To fix this, I put the cpuset path (which must be computed while holding cpuset_sem) in a temporary buffer, to be used in the call_usermodehelper call of /sbin/cpuset_release_agent only _after_ dropping cpuset_sem. So the new logic is: get cpuset_sem if cpuset marked notify_on_release and is ready to release: compute cpuset path relative to /dev/cpuset mount point stash path in kmalloc'd buffer drop cpuset_sem call_usermodehelper() forks /sbin/cpuset_release_agent with path free path The sharp eyed reader might notice that this patch does not contain any calls to kmalloc. The existing code in the check_for_release() routine was already kmalloc'ing a buffer to hold the cpuset path. In the old code, it just held the buffer for a few lines, over the cpuset_release_agent() call that in turn invoked call_usermodehelper(). In the new code, with the application of this patch, it returns that buffer via the new char **ppathbuf parameter, for later use and freeing in cpuset_release_agent(), which is called after cpuset_sem is dropped. Whereas the old code has just one call to cpuset_release_agent(), right in the check_for_release() routine, the new code has three calls to cpuset_release_agent(), from the various places that a cpuset can be released. This patch has been build and booted on SN2, and passed a stress test that previously hit the deadlock within a few seconds. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a242b44da6feb604c4c659b78f63dedb69b2d4a3 tree a493e87fa97137e1ae53a071df7128a23c515e52 parent 01df0e3a79d3913df178e9a1047ade425a7c118f author Ralf Baechle Tue, 09 Aug 2005 10:07:57 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:21 -0700 [PATCH] Build fix for the Sibyte I2C driver Compile fix for the BCM1250 I2C driver. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01df0e3a79d3913df178e9a1047ade425a7c118f tree 8e2640f616d6611cd32e8b6117d839b94ba5af6b parent 00dd1e433967872f3997a45d5adf35056fdf2f56 author Wim Van Sebroeck Tue, 09 Aug 2005 10:07:56 -0700 committer Linus Torvalds Tue, 09 Aug 2005 12:08:21 -0700 [PATCH] i8xx_tco.c: arm watchdog only when started i8xx_tco.c v0.08: only "arm" the watchdog when the watchdog has been started. (Kernel Bug 4251: system reset when battery is read and i8xx_tco driver loaded) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bb8345db8f2aef367e0fddf99a42b7a6029b31f tree f37ca7a3bd02f4eac8bb5b62d0068451666569f9 parent 5c44cd2afad3f7b015542187e147a820600172f1 author Salyzyn, Mark Tue, 09 Aug 2005 12:57:58 -0400 committer James Bottomley Tue, 09 Aug 2005 12:09:53 -0500 [SCSI] dpt_i2o pci_request_regions fix Originally From: Andrew Morton Altered By: "Salyzyn, Mark" There is an additional 'build fix' patch that Andrew Morton submitted on the kernel list (I have changed out his dpr_i2o with dpt_i2o below though). Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 00dd1e433967872f3997a45d5adf35056fdf2f56 tree 234735d17dc912f34a14eefd6299313357bfd5c5 parent dc836b5b6fcde95f750a4790d8200fabaf563dc9 author John McCutchan Mon, 08 Aug 2005 22:13:05 -0400 committer Linus Torvalds Mon, 08 Aug 2005 19:22:42 -0700 [PATCH] fsnotify-cleanups This removes the now unused fsnotify_unlink & fsnotify_rmdir code. Compile tested. Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit dc836b5b6fcde95f750a4790d8200fabaf563dc9 tree 893613626de4794a7b13fe6793bdebc79420c433 parent 138b9dd1fd7b44176af4f3b672060c790b0eaf55 author Linus Torvalds Mon, 08 Aug 2005 18:46:09 -0700 committer Linus Torvalds Mon, 08 Aug 2005 18:46:09 -0700 Revert "[PATCH] PCI: restore BAR values..." Revert commit fec59a711eef002d4ef9eb8de09dd0a26986eb77, which is breaking sparc64 that doesn't have a working pci_update_resource. We'll re-do this after 2.6.13 when we'll do it all properly. commit 138b9dd1fd7b44176af4f3b672060c790b0eaf55 tree aba0bffcaaee3fd29c1e3142a4c10331b4858293 parent 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 author Dave Jones Mon, 08 Aug 2005 16:13:15 -0700 committer Linus Torvalds Mon, 08 Aug 2005 16:21:32 -0700 [PATCH] icn driver fails to unload when no hardware present Fix a null dereference in module unload path. Found by a simple modprobe icn ; rmmod icn Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 tree 74a41755d00b908b6e6e31a69ba77774558bf26f parent 03c6b749b364fe7b8e47ed8e1ce26baca167c322 parent ca9334523c853e407da7b3a0bd02f54d0fa59414 author Linus Torvalds Mon, 08 Aug 2005 16:06:01 -0700 committer Linus Torvalds Mon, 08 Aug 2005 16:06:01 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit fb573856b2d82926b36ed059899d883474a3b9eb tree 310364196ff73647fcdce8e5f3746e2538ad5b0b parent 688d191821de7893043f5a37970472627aaffa4e author Ken Chen Mon, 08 Aug 2005 15:25:00 -0700 committer Tony Luck Mon, 08 Aug 2005 15:39:47 -0700 [IA64] fix nohalt boot option this changeset broke the "nohalt" kernel boot option. 8df5a500a3e97f7811cdce0f553ca1917ccd4220 default_idle() is looking at new variable can_do_pal_halt. However, that variable did not get cleared upon "nohalt" boot option. Result is that "nohalt" option is ignored until perfmon is exercised. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 03c6b749b364fe7b8e47ed8e1ce26baca167c322 tree e1d84aa44d53f8c67d0ba1e0e633c167d7761a58 parent 5e708484d710bcbb44893400f429579f5728cd7d author Olaf Hering Mon, 08 Aug 2005 14:49:18 -0700 committer Linus Torvalds Mon, 08 Aug 2005 15:29:13 -0700 [PATCH] x86_64: add MODULE_ALIAS for aes modprobe aes does not work on x86_64. i386 has a similar line, this could be the right fix. Would be nice to have in 2.6.13 final. Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e708484d710bcbb44893400f429579f5728cd7d tree 8297ba1f5e1e8c9020026afdd67c96d9c4fff29c parent b612cacb02f0fb58f07a9002c7719a901882718c author Kumar Gala Mon, 08 Aug 2005 14:49:17 -0700 committer Linus Torvalds Mon, 08 Aug 2005 15:29:13 -0700 [PATCH] ppc32: Fix MPC834x USB memory map offsets The memory mappings for MPC8349 USB MPH and DR modules were reversed. Signed-off-by: Li Yang Signed-off-by: Jiang Bo Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c44cd2afad3f7b015542187e147a820600172f1 tree ef4b63ee55d0481569b1bd680e376b0d94b2b6f0 parent 9c472dd9197429a37691e91c938660a062bf20b0 author James.Smart@Emulex.Com Fri, 10 Jun 2005 22:24:30 -0400 committer James Bottomley Mon, 08 Aug 2005 17:14:55 -0500 [SCSI] fix target scanning oops with fc transport class We have some nasty issues with 2.6.12-rc6. Any request to scan on the lpfc or qla2xxx FC adapters will oops. What is happening is the system is defaulting to non-transport registered targets, which inherit the parent of the scan. On this second scan, performed by the attribute, the parent becomes the shost instead of the rport. The slave functions in the 2 FC adapters use starget_to_rport() routines, which incorrectly map the shost as an rport pointer. Additionally, this pointed out other weaknesses: - If the target structure is torn down outside of the transport, we have no method for it to be regenerated at the proper parent. - We have race conditions on the target being allocated by both the midlayer scan (parent=shost) and by the fc transport (parent=rport). Signed-off-by: James Bottomley commit ca9334523c853e407da7b3a0bd02f54d0fa59414 tree 3c4f8050d9bc0e062038c1f7e22722e0e6447bfc parent 4d479e40e1748a877a24015fc6727b27b77110cd author Heikki Orsila Mon, 08 Aug 2005 14:26:52 -0700 committer David S. Miller Mon, 08 Aug 2005 14:26:52 -0700 [IPV4]: Debug cleanup Here's a small patch to cleanup NETDEBUG() use in net/ipv4/ for Linux kernel 2.6.13-rc5. Also weird use of indentation is changed in some places. Signed-off-by: Heikki Orsila Signed-off-by: David S. Miller commit 4d479e40e1748a877a24015fc6727b27b77110cd tree 6b6983091e6c7ef6f648282c57ed7a725a2db72d parent 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788 author David S. Miller Mon, 08 Aug 2005 13:48:02 -0700 committer David S. Miller Mon, 08 Aug 2005 13:48:02 -0700 [NETLINK]: Allocate and kill some netlink numbers. NETLINK_ARPD is unused, allocate it to the Open-iSCSI folks. NETLINK_ROUTE6 and NETLINK_TAPBASE are no longer used, delete them. Signed-off-by: David S. Miller commit b612cacb02f0fb58f07a9002c7719a901882718c tree f528e2ee1b39ad3c70336b29469d0b5645bc9e97 parent 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a parent 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 author Linus Torvalds Mon, 08 Aug 2005 12:19:24 -0700 committer Linus Torvalds Mon, 08 Aug 2005 12:19:24 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a tree ffd77cfbf621a990052c1277d8a18451b9363dda parent 1963c907b21e140082d081b1c8f8c2154593c7d7 author John McCutchan Mon, 08 Aug 2005 13:52:16 -0400 committer Linus Torvalds Mon, 08 Aug 2005 11:53:47 -0700 [PATCH] fsnotify_name/inoderemove The patch below unhooks fsnotify from vfs_unlink & vfs_rmdir. It introduces two new fsnotify calls, that are hooked in at the dcache level. This not only more closely matches how the VFS layer works, it also avoids the problem with locking and inode lifetimes. The two functions are - fsnotify_nameremove -- called when a directory entry is going away. It notifies the PARENT of the deletion. This is called from d_delete(). - inoderemove -- called when the files inode itself is going away. It notifies the inode that is being deleted. This is called from dentry_iput(). Signed-off-by: John McCutchan Signed-off-by: Linus Torvalds commit 1963c907b21e140082d081b1c8f8c2154593c7d7 tree 71410cd2ad9f4bdab2f2466a6621ba2930f16b5f parent 66aea23ff84ca81bfaeaf7d63e248b873f5c2616 author Michael Krufky Mon, 08 Aug 2005 09:22:43 -0700 committer Linus Torvalds Mon, 08 Aug 2005 11:49:57 -0700 [PATCH] dvb: lgdt330x frontend: some bug fixes & add lgdt3303 support - Structural changes within lgdt330x driver, framework now supports both chips... tested OK on lgdt3302 and lgdt3303. - Add LG/TUA6034 dvb_pll_desc for ATSC with LG TDVS-H062F & DViCO FusionHDTV5. - Fixed LGDT330X signal strength: For now, always set it to 0. - Corrected LGDT330X boundary condition error in read_snr: dB calculation. Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66aea23ff84ca81bfaeaf7d63e248b873f5c2616 tree 1dfa4af1f8b33c7d7b069c407d9c37ddd1ecae32 parent 8b83bc77bf77cc8459cb94e52b08e775104c4c48 author Cornelia Huck Mon, 08 Aug 2005 09:22:36 -0700 committer Linus Torvalds Mon, 08 Aug 2005 11:49:57 -0700 [PATCH] s390: use klist in qeth driver From: Martin Schwidesky Convert qeth to the new klist interface and make it compiling again. Signed-off-by: Frank Pavlic Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b83bc77bf77cc8459cb94e52b08e775104c4c48 tree 89f84bdd6a13763882636913852c6ce2eaea199c parent 48de5beeb0ee821859c79ba5b9462654604d8bf3 author Harald Welte Mon, 08 Aug 2005 11:50:55 +0200 committer Linus Torvalds Mon, 08 Aug 2005 11:48:28 -0700 [PATCH] don't try to do any NAT on untracked connections With the introduction of 'rustynat' in 2.6.11, the old tricks of preventing NAT of 'untracked' connections (e.g. NOTRACK target in 'raw' table) are no longer sufficient. The ip_conntrack_untracked.status |= IPS_NAT_DONE_MASK effectively prevents iteration of the 'nat' table, but doesn't prevent nat_packet() to be executed. Since nr_manips is gone in 'rustynat', nat_packet() now implicitly thinks that it has to do NAT on the packet. This patch fixes that problem by explicitly checking for ip_conntrack_untracked in ip_nat_fn(). Signed-off-by: Harald Welte Signed-off-by: Linus Torvalds commit 48de5beeb0ee821859c79ba5b9462654604d8bf3 tree 69ce3026aea31e44a83f23ed8ea0d700d19b4ef5 parent 6d85f29bb54235d2e184e7155dcd4de908324fe6 author James Morris Mon, 08 Aug 2005 10:29:08 -0400 committer Linus Torvalds Mon, 08 Aug 2005 11:46:25 -0700 [PATCH] Update contact info for James Morris commit 6d85f29bb54235d2e184e7155dcd4de908324fe6 tree 1ab80c4bb980fec383047e8e07a0fb8fa77b5994 parent db6778db7eb1d974e1ae0da326530f09c13585ac author Ivan Kokshaysky Mon, 08 Aug 2005 12:55:54 +0400 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] VIA VT8235 PCI quirk Like many other southbridges from different manufacturers, VIA VT8235 chip has two non-standard BARs for power management and SMBus registers (see the datasheet at http://www.via.com.tw). This new quirk routine fixes boot problem with 2.6.13-rc2/rc6 kernels on Targa Visionary 811 Athlon64 laptop, as reported by Mikael Pettersson . Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit db6778db7eb1d974e1ae0da326530f09c13585ac tree 0e645dfdd902e76c47884c8629b69a4089cca05e parent 0f0767c67a497173294bdf6725a3d85f7f29e397 author Antonino Daplas Mon, 08 Aug 2005 14:22:43 +0800 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] nvidiafb: Fix initial display corruption on certain laptops Reported by:Vincent Fortier (Bugzilla Bug 4768) "At boot time the screen appears moved to the mid right portion of the actual video pannel making the end of the line appears at the left edge... It simply looks like moved half way to the right" His particular hardware has a display with an unusual dimension (1920x1200) but unfortunately has no EDID block. None of the entries in the global mode database is correct for this particular display, and it particularly has difficulty scaling up 640x480 (the default startup mode of nvidiafb) to 1920x1200 which causes the above described problem. 1, Add 1920x1200 to the global mode database. 2. Let nvidiafb base the startup mode from the flatpanel dimensions only if the EDID block is absent, no boot mode parameter is specified by the user, and a flatpanel/LCD display is attached. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 0f0767c67a497173294bdf6725a3d85f7f29e397 tree 08c11f2a68489598bbd3e6b755b8c2b0a366322c parent 2c875bbda9303b359af94f671d25639840ce2a59 author Paul Mackerras Mon, 08 Aug 2005 14:16:43 +1000 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] ppc64: update defconfigs Update the default/example configs for ppc64. Pretty boring... Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 2c875bbda9303b359af94f671d25639840ce2a59 tree 9c9f5e4413205fd8062fc213af327e74bf7775af parent 6fc32179de9e14c542e0b1760e412bc670611c53 author Arnd Bergmann Mon, 08 Aug 2005 14:12:42 +1000 committer Linus Torvalds Mon, 08 Aug 2005 11:46:24 -0700 [PATCH] ppc64: add default config for BPA This adds a bpa_defconfig file and make target. The config settings are made for the current version of the Cell Processor Based Blade, so there are not too many drivers enabled. A few more drivers might get added in the future though. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 9c472dd9197429a37691e91c938660a062bf20b0 tree ffe17c0aa00728c0d4e1bebd203c68b9d16af58f parent 6fc32179de9e14c542e0b1760e412bc670611c53 author James Bottomley Mon, 08 Aug 2005 11:51:38 -0500 committer James Bottomley Mon, 08 Aug 2005 11:51:38 -0500 [SCSI] Bug 4940 Repeatable Kernel Panic on Adaptec 2015S I20 device on bootup From: "Salyzyn, Mark" Prevent driver from loading if another driver (i2o) has already claimed the resources associated with the card. Discussion associated with this bug can be referenced at http://bugzilla.kernel.org/show_bug.cgi?id=4940 where it was agreed to use pci_request_regions in both the dpt_i2o and the i2o driver to prevent both drivers loading on the same adapter(s). Signed-off-by: Mark Salyzyn Rejections fixed up and Signed-off-by: James Bottomley commit 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 tree 73c492d859266b54a556ec92471c76d035c926e9 parent fc1df37e3b195cb73ecb14c30d41b7aace3f844a author Christoph Hellwig Sun, 07 Aug 2005 14:23:42 +0100 committer Russell King Sun, 07 Aug 2005 14:23:42 +0100 [PATCH] ARM: switch fd1772.c from sleep_on to wait_event Doesn't make the local irq disabling around it less buggy, but at least we replace the offender with the right kind of primitive. Signed-off-by: Christoph Hellwig Signed-off-by: Russell King commit fc1df37e3b195cb73ecb14c30d41b7aace3f844a tree 9180f60ee3a816632b5ff9f8c8d774259af3d686 parent 0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66 author Russell King Sun, 07 Aug 2005 14:20:26 +0100 committer Russell King Sun, 07 Aug 2005 14:20:26 +0100 [PATCH] ARM: Make sa1100fb_display_dma_period() an inline function This function produces a warning when CPU_FREQ=n. Since it's a very simple calculation, make it inline instead of adding preprocessor directives around it. Signed-off-by: Russell King commit 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788 tree 790200fcdef86e91224903394023b964a3a52e47 parent 6fc0b4a7a73a81e74d0004732df358f4f9975be2 author David S. Miller Sat, 06 Aug 2005 06:35:48 -0700 committer David S. Miller Sat, 06 Aug 2005 06:35:48 -0700 [TG3]: Save initial PCI state before registering the netdevice. Else on SMP systems it is possible for hotplug to execute, invoke tg3_open(), and end up loading the uninitialized PCI register save area into the card. Signed-off-by: David S. Miller commit 6fc0b4a7a73a81e74d0004732df358f4f9975be2 tree ac2c68e206efbfe378728a50be30ef0bccd0cdff parent 534afb90a9cd0b9643f62d660c164e1d924f39cf author Herbert Xu Sat, 06 Aug 2005 06:33:15 -0700 committer David S. Miller Sat, 06 Aug 2005 06:33:15 -0700 [IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN. The interface needs much redesigning if we wish to allow normal users to do this in some way. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e tree 45692a1b3d770f721f4586ad81c206f1b8509b75 parent 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd parent 1c5ad84516ae7ea4ec868436a910a6bd8d20215a author Dave Kleikamp Thu, 04 Aug 2005 15:56:15 -0500 committer Dave Kleikamp Thu, 04 Aug 2005 15:56:15 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd tree f42fc0f8fc07dcd0c2cc15aa31566a321a8f2a30 parent da28c12089dfcfb8695b6b555cdb8e03dda2b690 author Dave Kleikamp Mon, 01 Aug 2005 16:54:26 -0500 committer Dave Kleikamp Mon, 01 Aug 2005 16:54:26 -0500 JFS: Check for invalid inodes in jfs_delete_inode Some error paths may iput an invalid inode with i_nlink=0. jfs should not try to actually delete such an inode. Signed-off-by: Dave Kleikamp commit da28c12089dfcfb8695b6b555cdb8e03dda2b690 tree b3ff509f21352ef053cb3d490cb13528090d32ac parent 6de7dc2c4c713d037c19aa1e310d240f16973414 parent 577a4f8102d54b504cb22eb021b89e957e8df18f author Dave Kleikamp Thu, 28 Jul 2005 09:03:36 -0500 committer Dave Kleikamp Thu, 28 Jul 2005 09:03:36 -0500 Merge with /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit 6de7dc2c4c713d037c19aa1e310d240f16973414 tree 68963db8081e6ef18affd06cf2e9b00578ef874e parent cbc3d65ebcb0c494183d45cf202a53352cbf3871 parent 9e566d8bd61f939b7f5d7d969f5b178571471cf9 author Dave Kleikamp Wed, 27 Jul 2005 12:50:08 -0500 committer Dave Kleikamp Wed, 27 Jul 2005 12:50:08 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit cbc3d65ebcb0c494183d45cf202a53352cbf3871 tree 4f05bef55fd76ddd7668187e84e7fbc16a4849f6 parent de8fd087b280797977b012a4275ee53ff2999f3f author Dave Kleikamp Wed, 27 Jul 2005 09:17:57 -0500 committer Dave Kleikamp Wed, 27 Jul 2005 09:17:57 -0500 JFS: Improve sync barrier processing Under heavy load, hot metadata pages are often locked by non-committed transactions, making them difficult to flush to disk. This prevents the sync point from advancing past a transaction that had modified the page. There is a point during the sync barrier processing where all outstanding transactions have been committed to disk, but no new transaction have been allowed to proceed. This is the best time to write the metadata. Signed-off-by: Dave Kleikamp commit de8fd087b280797977b012a4275ee53ff2999f3f tree 5cd65289983ad65812a6a4335fe657eeb125a7f0 parent 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 parent 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 author Dave Kleikamp Tue, 26 Jul 2005 09:55:10 -0500 committer Dave Kleikamp Tue, 26 Jul 2005 09:55:10 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp