0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf Author: Linus Torvalds Date: Tue Aug 23 20:39:14 2005 -0700 Linux v2.6.13-rc7 Too many changes to release a final 2.6.13. 9138dccbb9f39f12474554ef93dcc24de2e9c8f6 Author: Deepak Saxena Date: Tue Aug 23 13:30:29 2005 -0700 [PATCH] Fix IXP4xx CLOCK_TICK_RATE As pointed out in the following thread, the CLOCK_TICK_RATE setting for IXP4xx is incorrect b/c the HW ignores the lowest 2 bits of the LATCH value. http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2005-August/030950.html Tnx to George Anziger and Egil Hjelmeland for finding the issue. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds d10689b68aff7b48e3de1a3f7fcd6567bd2905af Author: Paul Jackson Date: Tue Aug 23 01:04:27 2005 -0700 [PATCH] cpu_exclusive sched domains on partial nodes temp fix This keeps the kernel/cpuset.c routine update_cpu_domains() from invoking the sched.c routine partition_sched_domains() if the cpuset in question doesn't fall on node boundaries. I have boot tested this on an SN2, and with the help of a couple of ad hoc printk's, determined that it does indeed avoid calling the partition_sched_domains() routine on partial nodes. I did not directly verify that this avoids setting up bogus sched domains or avoids the oops that Hawkes saw. This patch imposes a silent artificial constraint on which cpusets can be used to define dynamic sched domains. This patch should allow proceeding with this new feature in 2.6.13 for the configurations in which it is useful (node alligned sched domains) while avoiding trying to setup sched domains in the less useful cases that can cause the kernel corruption and oops. Signed-off-by: Paul Jackson Acked-by: Ingo Molnar Acked-by: Dinakar Guniguntala Acked-by: John Hawkes Signed-off-by: Linus Torvalds ae75784bc576a1af70509c2f3ba2b70bb65a0c58 Merge: 005940ead619c2867e0465c8e0fffb9e5989b57e 7087e295543d3f6e161530e07982fd979e2d9efc Author: Linus Torvalds Date: Tue Aug 23 20:00:48 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 005940ead619c2867e0465c8e0fffb9e5989b57e Merge: d3813fcf105814d06b47fa586f6b61f3cff1cefc 6885433c25aaca2cb13ee52a94be156163d6aa23 Author: Linus Torvalds Date: Tue Aug 23 20:00:17 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev d3813fcf105814d06b47fa586f6b61f3cff1cefc Author: Andi Kleen Date: Tue Aug 23 03:14:27 2005 +0200 [PATCH] x86_64: Don't oops at boot when empty Opteron node has IO The code to detect IO links on Opteron would not check if the node had actually memory. This could lead to pci_bus_to_node returning an invalid node, which might cause crashes later when dma_alloc_coherent passes it to page_alloc_node(). The bug has been there forever but for some reason it is causing now crashes. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds 2bbfb16bf345acd81ab1e6e3d4b35964650517ac Author: lepton Date: Mon Aug 22 17:06:14 2005 -0700 [PATCH] usbnet oops fix There's a "return the wrong SKB" error in the GL620A cable minidriver (for "usbnet") which can oops. This would not appear when talking Linux-to-Linux, only Linux-to-Windows (for recent Linuxes). Signed-off-by: David Brownell Signed-off-by: Linus Torvalds b1daec3089a129a67169d3ae975985a7480fe17f Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Tue Aug 23 21:36:40 2005 -0400 [PATCH] i386: fix incorrect FP signal code i386 floating-point exception handling has a bug that can cause error code 0 to be sent instead of the proper code during signal delivery. This is caused by unconditionally checking the IS and c1 bits from the FPU status word when they are not always relevant. The IS bit tells whether an exception is a stack fault and is only relevant when the exception is IE (invalid operation.) The C1 bit determines whether a stack fault is overflow or underflow and is only relevant when IS and IE are set. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds 11532cc6aa73a47023268d718bf43b646494615c Merge: 17566c3c5ed3ea8f941a135cf960387214c4f6ac c1cc168442a943ed3997f6543db87c061987f9d7 Author: Linus Torvalds Date: Tue Aug 23 19:21:44 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 17566c3c5ed3ea8f941a135cf960387214c4f6ac Author: Al Viro Date: Tue Aug 23 22:48:22 2005 +0100 [PATCH] s390 __CHECKER__ ifdefs remove the bogus games with explicit ifdefs on __CHECKER__ Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 8032230694ec56c168a1404c67a54d281536cbed Author: Al Viro Date: Tue Aug 23 22:48:17 2005 +0100 [PATCH] %t... in vsnprintf handling of %t... (ptrdiff_t) in vsnprintf Signed-off-by: Al Viro Signed-off-by: Linus Torvalds acd3bd82c08d1a399760605706a86821148243d9 Author: Al Viro Date: Tue Aug 23 22:48:12 2005 +0100 [PATCH] ad1980 makefile fix ac97_plugin_ad1980 should trigger build of ac97_codec Signed-off-by: Al Viro Signed-off-by: Linus Torvalds fa53bb650e6747628276e3ab6d98f51d9bfb0573 Author: Al Viro Date: Tue Aug 23 22:48:07 2005 +0100 [PATCH] Kconfig fix (non-modular SCSI drivers) non-modular scsi drivers depend on built-in scsi Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 0e6d0d89343ab24ddeb39f8b2ffdd2d4c194427c Author: Al Viro Date: Tue Aug 23 22:48:02 2005 +0100 [PATCH] Kconfig fix (missing dependencies on PCI in sound/*) a bunch of PCI-only drivers didn't have the right dependency Signed-off-by: Al Viro Signed-off-by: Linus Torvalds eaaece266a78b8f56ade48fe23147b8b933364de Author: Al Viro Date: Tue Aug 23 22:47:57 2005 +0100 [PATCH] missing exports on m32r missing exports on m32r Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 33215652e4a75dfa8adb20f4d741517457b0da2b Author: Al Viro Date: Tue Aug 23 22:47:52 2005 +0100 [PATCH] qualifiers in return types - easy cases a bunch of functions switched from volatile to __attribute__((noreturn)) and from const to __attribute_pure__ Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ade31f38f2ef61900e901d26061deff0c4dba085 Author: Al Viro Date: Tue Aug 23 22:47:47 2005 +0100 [PATCH] typo fix in qdio.c dumb typo: u32 volatile * mistyped as u32 * volatile Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 530d8e97384fd2a6805fa4515a4e6828d7b53ee2 Author: Al Viro Date: Tue Aug 23 22:47:42 2005 +0100 [PATCH] emac netpoll fix netpoll is void(struct net_device *), not int(struct net_device *) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 791cdc7c561e2e72596388533f959e6d74dc6231 Author: Al Viro Date: Tue Aug 23 22:47:37 2005 +0100 [PATCH] vidc gcc4 fix removes an extern for a static variable. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 0cbdff4f7fc642deb1f36bc035cf60b7bdc497d5 Author: Al Viro Date: Tue Aug 23 22:47:32 2005 +0100 [PATCH] broken inline asm on s390 (misuse of labels) use of explicit labels in inline asm is a Bad Idea(tm), since gcc can decide to inline the function in several places. Fixed by use of 1f/f: instead of .Lfitsin/.Lfitsin: Signed-off-by: Al Viro Signed-off-by: Linus Torvalds a828b8e4e699b5e3ce0dcbb708ecb099b86f3126 Author: Al Viro Date: Tue Aug 23 22:47:27 2005 +0100 [PATCH] m32r_sio gcc4 fixes extern declaration followed by static in drivers/serial/m32r_sio.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds c51d9943b11441fd1ea42c7e70cfb5eed33fe97b Author: Al Viro Date: Tue Aug 23 22:47:22 2005 +0100 [PATCH] m32r icu_data gcc4 fixes either icu_data declaration for SMP case should be taken out of m32102.h, or its declarations for m32700ut and opsput should not be static for SMP. Patch does the latter - judging by comments in m32102.h it is intended to be non-static. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds e231a9c4fdf402bcfd5a7c27be49050882631a95 Author: Al Viro Date: Tue Aug 23 22:47:17 2005 +0100 [PATCH] m32r smp.h gcc4 fixes extern on physid_2_cpu[] does not belong in smp.h - the thing is static. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 719e5985cf79bb60f4a28816547efd27dde178f5 Author: Al Viro Date: Tue Aug 23 22:47:12 2005 +0100 [PATCH] alpha spinlock code and bogus constraints "=m" (lock->lock) / "1" (lock->lock) makes gcc4 unhappy; fixed by s/1/m/, same as in case of i386 rwsem.h where such variant had been accepted by both Linus and rth. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 79fb7bdce363685b336e3f0fb8207312fd1f02fc Author: Al Viro Date: Tue Aug 23 22:47:07 2005 +0100 [PATCH] alpha xchg fix alpha xchg has to be a macro - alpha disables always_inline and if that puppy does not get inlined, we immediately blow up on undefined reference. Happens even on gcc3; with gcc4 that happens a _lot_. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 531e5ca62bd9aabef6bd8340d8ae93bac1b5caa2 Author: Al Viro Date: Tue Aug 23 22:47:01 2005 +0100 [PATCH] missing include in pcmcia_resource.c missing include of asm/irq.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 18415e923e90b986db316abd078f6d863cee7b18 Author: Al Viro Date: Tue Aug 23 22:46:56 2005 +0100 [PATCH] alpha gcc4 warnings on UP smp_call_function() is expanded to expression. Alpha oprofile calls that puppy and ignores the return value. And has -Werror for arch/*... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds a238b563502a7f458624b9c6404742e441b2f9e8 Author: Al Viro Date: Tue Aug 23 22:46:51 2005 +0100 [PATCH] Kconfig fix (sparc32 drivers/char dependencies) since sparc32 Kconfig includes drivers/char/Kconfig (instead of duplicating its parts) we need several new dependencies there to exclude the stuff broken on sparc32 and not excluded by existing dependencies. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 997183dc2a8992374d93e66f5ea0d58fa1022a47 Author: Al Viro Date: Tue Aug 23 22:46:46 2005 +0100 [PATCH] Kconfig fix (emac dependencient) emac doesn't build modular; ibm_emac_debug doesn't build at all (missing headers). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 6299afc40c8612a87358ecea80882395fe67111f Author: Al Viro Date: Tue Aug 23 22:46:41 2005 +0100 [PATCH] Kconfig fix (CONFIG_PM on 44x) CONFIG_PM is broken on 44x; removed duplicate entry for CONFIG_PM, made the inclusion of generic one conditional on BROKEN || !44x. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds f08243a491f3e21feabbb04476a03fb0cbc975ff Author: Al Viro Date: Tue Aug 23 22:46:36 2005 +0100 [PATCH] Kconfig fix (ppc 4xx and early serial) a bunch of ppc 4xx variants unconditionally calls early_serial_setup() and therefore needs SERIAL_8250 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds c4457fb9010765620faebccf4daf83b288295154 Author: Al Viro Date: Tue Aug 23 22:46:31 2005 +0100 [PATCH] Kconfig fix (IRQ_ALL_CPUS vs. MV64360) MV64360 does not support IRQ_ALL_CPUS - see arch/ppc/kernel/mv64360_pic.c. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ee449f514d2af21f3422c29702e6b0995c4c2a9c Author: Al Viro Date: Tue Aug 23 22:46:26 2005 +0100 [PATCH] Kconfig fix (ppc32 SMP dependencies) ppc SMP is supported only for 6xx/POWER3/POWER4 - i.e. ones that have PPC_STD_MMU. Dependency fixed. Signed-off-by: Al Viro Acked-by: Paul Mackerras Signed-off-by: Linus Torvalds 51583cf108b27baf81c6db3ec718f932314986ea Author: Al Viro Date: Tue Aug 23 22:46:21 2005 +0100 [PATCH] Kconfig fix (VGA console on arm/versatile) VGA console doesn't exist (or build) on arm/versatile; dependency fixed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 84b6a2323a2b9482958965bc66bbfbd2711cde71 Author: Al Viro Date: Tue Aug 23 22:46:16 2005 +0100 [PATCH] Kconfig fix (amba on arm/versatile) AMBA_PL010 is broken on arm/versatile; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds a838e543db8f65ccbc710548916f20c23e51a363 Author: Al Viro Date: Tue Aug 23 22:46:11 2005 +0100 [PATCH] Kconfig fix (acornscsi) acornscsi had been broken for a long time; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 9ff658589b8549a9142708d34625c7db6e34a672 Author: Al Viro Date: Tue Aug 23 22:46:06 2005 +0100 [PATCH] Kconfig fix (M32R_PLDSIO dependecies) M32R_PLDSIO depends on subarchitecture providing PLD_ESIO0CR and friends. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 14d891d20374c139acfaa379e61a7091b00df8fa Author: Al Viro Date: Tue Aug 23 22:46:01 2005 +0100 [PATCH] Kconfig fix (parport_pc on m32r) parport_pc shouldn't be picked on m32r (no asm/parport.h, for starters) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ab62c1e1dae0dedfc300c9f8e5c74227a8e26665 Author: Al Viro Date: Tue Aug 23 22:45:56 2005 +0100 [PATCH] Kconfig fix (airo_cs on m32r) airo_cs is broken on m32r; marked as such. [Proper fix would involve separating PCI-dependent parts and making sure they don't get in the way _and_ arranging for asm/scatterlist.h getting picked on m32r] Signed-off-by: Al Viro Signed-off-by: Linus Torvalds a4d544fdd30111a1183ab92ea25febb8b6460214 Author: Al Viro Date: Tue Aug 23 22:45:51 2005 +0100 [PATCH] Kconfig fix (tms380tr and ISA_DMA_API) ISA parts of tms380tr are using ISA DMA helpers and should depend on ISA_DMA_API. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds b545d48ca0e41803a19864c924d2efcdd4839df2 Author: Al Viro Date: Tue Aug 23 22:45:46 2005 +0100 [PATCH] Kconfig fix (arv) arv uses constants provided only by include/asm-m32r/m32700ut/m32700ut_lan.h It won't build for any subarchitecture other than M32700UT; marked as such. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds a2b2f45be7e9138bde7fcba3b8e9257fea04d087 Author: Al Viro Date: Tue Aug 23 22:45:41 2005 +0100 [PATCH] Kconfig fix (infiniband and PCI) infiniband uses PCI helpers all over the place (including the core parts) and won't build without PCI. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 697ae16ac0482283741f42378108b67b492870e8 Author: Al Viro Date: Tue Aug 23 22:45:36 2005 +0100 [PATCH] Kconfig fix (DEBUG_PAGEALLOC on m32r) DEBUG_PAGEALLOC is broken on m32r - the option had been blindly copied from i386; kernel_map_pages() had not and that's what is needed for DEBUG_PAGEALLOC to work (or link, while we are at it). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds c3a0f7718c84737440a621f6a8600f2e7b896a44 Author: Al Viro Date: Tue Aug 23 22:45:31 2005 +0100 [PATCH] Kconfig fix (PCI on m32r) PCI support is broken on m32r (pci_map_... missing, etc.); marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 897874fa9c58898767f081e12d70a1855b66331d Author: Al Viro Date: Tue Aug 23 22:45:26 2005 +0100 [PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64) PMAC_BACKLIGHT is broken on ppc64; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 6622b8c780366f21c6bfaeebc6db8e591aa9ca2b Author: Al Viro Date: Tue Aug 23 22:45:21 2005 +0100 [PATCH] Kconfig fix (HISAX_FRITZPCI on ppc64) HISAX_FRITZPCI is broken on ppc64; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 253a9c3308dd931e35f8527d9bda7dba591601d3 Author: Al Viro Date: Tue Aug 23 22:45:16 2005 +0100 [PATCH] Kconfig fix (m32r genrtc) genrtc is not for m32r; marked as such. Probably ought to put that into arch/* - list of "don't build it on " is getting too long. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds c5596b267a95bdea865b966a3d6cc6e52e7feae7 Author: Al Viro Date: Tue Aug 23 22:45:11 2005 +0100 [PATCH] Kconfig fix (m32r NUMA) NUMA is broken on m32r; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 276bd31ce5af01350465861af7aa6a25864eb108 Author: Al Viro Date: Tue Aug 23 22:45:06 2005 +0100 [PATCH] Kconfig fix (ISA_DMA_API and sound/*) fixed kconfig dependencies on ISA_DMA_API for parts of sound/* that rely on it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds e9bcb173dd1747075214a1ccdb65dc6320cae49d Author: Al Viro Date: Tue Aug 23 22:45:01 2005 +0100 [PATCH] Kconfig fix (epca on 64bit) epca is broken on 64bit; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds ac6babd26ce514e0017ec5809051ea6cdc44c8f6 Author: Al Viro Date: Tue Aug 23 22:44:55 2005 +0100 [PATCH] Kconfig fix (arm SMP) SMP is broken on arm; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds 6df7c994a0090bf1e9604d690cde8e76b2618e4a Author: Al Viro Date: Tue Aug 23 22:44:50 2005 +0100 [PATCH] Kconfig fix (alpha NUMA) NUMA is broken on alpha; marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds c1cc168442a943ed3997f6543db87c061987f9d7 Author: David S. Miller Date: Tue Aug 23 14:55:32 2005 -0700 [ROSE]: Fix typo in rose_route_frame() locking fix. Signed-off-by: David S. Miller 81065e2f415af6c028eac13f481fb9e60a0b487b Author: Alexey Dobriyan Date: Mon Aug 22 13:11:09 2005 -0700 [PATCH] zd1201 kmalloc size fix Noticed by Coverity checker. (akpm: I stole this from Greg's tree and used the (IMO) tidier sizeof(*p) construct). Signed-off-by: Alexey Dobriyan Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds 005eca5e74b222db4360f8938140eb843d283325 Author: NeilBrown Date: Mon Aug 22 13:11:08 2005 -0700 [PATCH] md: make sure resync gets started when array starts. We weren't actually waking up the md thread after setting MD_RECOVERY_NEEDED when assembling an array, so it is possible to lose a race and not actually start resync. So add a call to md_wakeup_thread, and while we are at it, remove all the "if (mddev->thread)" guards as md_wake_thread does its own checking. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds 4c5640cb5f5a6fd780d99397eca028b575cb1206 Author: David Meybohm Date: Mon Aug 22 13:11:08 2005 -0700 [PATCH] preempt race in getppid With CONFIG_PREEMPT && !CONFIG_SMP, it's possible for sys_getppid to return a bogus value if the parent's task_struct gets reallocated after current->group_leader->real_parent is read: asmlinkage long sys_getppid(void) { int pid; struct task_struct *me = current; struct task_struct *parent; parent = me->group_leader->real_parent; RACE HERE => for (;;) { pid = parent->tgid; #ifdef CONFIG_SMP { struct task_struct *old = parent; /* * Make sure we read the pid before re-reading the * parent pointer: */ smp_rmb(); parent = me->group_leader->real_parent; if (old != parent) continue; } #endif break; } return pid; } If the process gets preempted at the indicated point, the parent process can go ahead and call exit() and then get wait()'d on to reap its task_struct. When the preempted process gets resumed, it will not do any further checks of the parent pointer on !CONFIG_SMP: it will read the bad pid and return. So, the same algorithm used when SMP is enabled should be used when preempt is enabled, which will recheck ->real_parent in this case. Signed-off-by: David Meybohm Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds 3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f Merge: a4cce10492358b33d33bb43f98284c80482037e8 dc16aaf29d64b8c5e0b88f49a4d541edf5b61e42 Author: Linus Torvalds Date: Tue Aug 23 11:06:56 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 dc16aaf29d64b8c5e0b88f49a4d541edf5b61e42 Author: David S. Miller Date: Tue Aug 23 10:50:09 2005 -0700 [ROSE]: Fix missing unlocks in rose_route_frame() Noticed by Coverity checker. Signed-off-by: David S. Miller d5d283751ef3c05b6766501a46800cbee84959d6 Author: David S. Miller Date: Tue Aug 23 10:49:54 2005 -0700 [TCP]: Document non-trivial locking path in tcp_v{4,6}_get_port(). This trips up a lot of folks reading this code. Put an unlikely() around the port-exhaustion test for good measure. Signed-off-by: David S. Miller 89ebd197eb2cd31d6187db344d5117064e19fdde Author: David S. Miller Date: Tue Aug 23 10:13:06 2005 -0700 [TCP]: Unconditionally clear TCP_NAGLE_PUSH in skb_entail(). Intention of this bit is to force pushing of the existing send queue when TCP_CORK or TCP_NODELAY state changes via setsockopt(). But it's easy to create a situation where the bit never clears. For example, if the send queue starts empty: 1) set TCP_NODELAY 2) clear TCP_NODELAY 3) set TCP_CORK 4) do small write() The current code will leave TCP_NAGLE_PUSH set after that sequence. Unconditionally clearing the bit when new data is added via skb_entail() solves the problem. Signed-off-by: David S. Miller 0fbbeb1ba43bd04f0f1d4f161b7f72437a1c8a03 Author: Thomas Graf Date: Tue Aug 23 10:12:44 2005 -0700 [PKT_SCHED]: Fix missing qdisc_destroy() in qdisc_create_dflt() qdisc_create_dflt() is missing to destroy the newly allocated default qdisc if the initialization fails resulting in leaks of all kinds. The only caller in mainline which may trigger this bug is sch_tbf.c in tbf_create_dflt_qdisc(). Note: qdisc_create_dflt() doesn't fulfill the official locking requirements of qdisc_destroy() but since the qdisc could never be seen by the outside world this doesn't matter and it can stay as-is until the locking of pkt_sched is cleaned up. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller d2287f844187158e5eddd0d5de8e95bd607abcb7 Author: Vlad Yasevich Date: Tue Aug 23 10:12:04 2005 -0700 [SCTP]: Add SENTINEL to SCTP MIB stats Add SNMP_MIB_SENTINEL to the definition of the sctp_snmp_list so that the output routine in proc correctly terminates. This was causing some problems running on ia64 systems. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller 01d7dd0e9f8c5f1888619d2649c7da389232b408 Author: Ralf Baechle Date: Tue Aug 23 10:11:45 2005 -0700 [AX25]: UID fixes o Brown paperbag bug - ax25_findbyuid() was always returning a NULL pointer as the result. Breaks ROSE completly and AX.25 if UID policy set to deny. o While the list structure of AX.25's UID to callsign mapping table was properly protected by a spinlock, it's elements were not refcounted resulting in a race between removal and usage of an element. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller 53b924b31fa53ac3007df3fef6870d5074a9adf8 Author: Ralf Baechle Date: Tue Aug 23 10:11:30 2005 -0700 [NET]: Fix socket bitop damage The socket flag cleanups that went into 2.6.12-rc1 are basically oring the flags of an old socket into the socket just being created. Unfortunately that one was just initialized by sock_init_data(), so already has SOCK_ZAPPED set. As the result zapped sockets are created and all incoming connection will fail due to this bug which again was carefully replicated to at least AX.25, NET/ROM or ROSE. In order to keep the abstraction alive I've introduced sock_copy_flags() to copy the socket flags from one sockets to another and used that instead of the bitwise copy thing. Anyway, the idea here has probably been to copy all flags, so sock_copy_flags() should be the right thing. With this the ham radio protocols are usable again, so I hope this will make it into 2.6.13. Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller 66a79a19a7c582efd99bb143c3a59fbda006eb39 Author: Patrick McHardy Date: Tue Aug 23 10:10:35 2005 -0700 [NETFILTER]: Fix HW checksum handling in ip_queue/ip6_queue The checksum needs to be filled in on output, after mangling a packet ip_summed needs to be reset. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller 1344a41637114485fac7afa1505bce2ff862807a Author: Dave Johnson Date: Tue Aug 23 10:10:15 2005 -0700 [IPV4]: Fix negative timer loop with lots of ipv4 peers. From: Dave Johnson Found this bug while doing some scaling testing that created 500K inet peers. peer_check_expire() in net/ipv4/inetpeer.c isn't using inet_peer_gc_mintime correctly and will end up creating an expire timer with less than the minimum duration, and even zero/negative if enough active peers are present. If >65K peers, the timer will be less than inet_peer_gc_mintime, and with >70K peers, the timer duration will reach zero and go negative. The timer handler will continue to schedule another zero/negative timer in a loop until peers can be aged. This can continue for at least a few minutes or even longer if the peers remain active due to arriving packets while the loop is occurring. Bug is present in both 2.4 and 2.6. Same patch will apply to both just fine. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller c3a20692ca5c8eb8cf5d0f489d4fc839ce7593d1 Author: Herbert Xu Date: Tue Aug 23 10:09:53 2005 -0700 [RPC]: Kill bogus kmap in krb5 While I was going through the crypto users recently, I noticed this bogus kmap in sunrpc. It's totally unnecessary since the crypto layer will do its own kmap before touching the data. Besides, the kmap is throwing the return value away. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller 14869c388673e8db3348ab3706fa6485d0f0cf95 Author: Dmitry Yusupov Date: Tue Aug 23 10:09:27 2005 -0700 [TCP]: Do TSO deferral even if tail SKB can go out now. If the tail SKB fits into the window, it is still benefitical to defer until the goal percentage of the window is available. This give the application time to feed more data into the send queue and thus results in larger TSO frames going out. Patch from Dmitry Yusupov . Signed-off-by: David S. Miller a4cce10492358b33d33bb43f98284c80482037e8 Author: Peter Chubb Date: Mon Aug 22 17:50:00 2005 -0700 [IA64] Fix simulator boot (for real this time). Thanks to Stephane, we've now worked out the real cause of the `Linux will not boot on simulator' problem. Turns out it's a stack overflow because the stack pointer wasn't being initialised properly in boot_head.S (it was being initialised to the lowest instead of the highest address of the stack, so the first push started to overwrite data in the BSS). Signed-off-by: Peter Chubb Signed-off-by: Tony Luck 62d75f3753647656323b0365faa43fc1a8f7be97 Author: Tony Luck Date: Tue Aug 23 07:39:15 2005 -0700 [IA64] backout incorrect fix for simulator boot issue Earlier fix in 4aec0fb12267718c750475f3404337ad13caa8f5 just masked the real problem. Signed-off-by: Tony Luck 034e5356a4c0401d1227393de4c756e9c414be35 Merge: 729c80c6ffd7633210a09d4b55fdfab3c8d1866b c1ffb910f7a4e1e79d462bb359067d97ad1a8a25 Author: Tony Luck Date: Tue Aug 23 07:27:28 2005 -0700 Pull prarit-bus-sysdata into release branch 6885433c25aaca2cb13ee52a94be156163d6aa23 Author: Jeff Garzik Date: Tue Aug 23 02:53:51 2005 -0400 libata: release prep (bump versions, etc.) - bump versions where necessary - remove two duplicated+outdated doc comments - add MODULE_VERSION() to AHCI driver 7087e295543d3f6e161530e07982fd979e2d9efc Author: John W. Linville Date: Thu Aug 4 14:40:25 2005 -0400 [PATCH] i810_audio: fix release_region misordering in error exit from i810_probe Re-order release_region calls in i810_probe to properly unwind preceding allocations. Signed-off-by: John W. Linville Signed-off-by: Jeff Garzik 729c80c6ffd7633210a09d4b55fdfab3c8d1866b Merge: 4eaefb39528b3a78fb6a784162200b198d3e16ee f6fdd7d9c273bb2a20ab467cb57067494f932fa3 Author: Tony Luck Date: Mon Aug 22 14:31:36 2005 -0700 Auto-update from upstream f6fdd7d9c273bb2a20ab467cb57067494f932fa3 Author: Linus Torvalds Date: Sat Aug 20 18:51:29 2005 -0700 Don't allow normal users to set idle IO priority It has all the normal priority inversion problems. Signed-off-by: Linus Torvalds 7e71af49d46e4c25f17a2c8f53d62ffd14f01007 Author: Patrick McHardy Date: Sat Aug 20 17:40:41 2005 -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 f93592ff4fa4a55aa7640d435fa93338e190294d Author: Patrick McHardy Date: Sat Aug 20 17:39:15 2005 -0700 [NETFILTER]: Fix HW checksum handling in ECN target Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller fd841326d73096ad79be9c3fa348f9ad04541cc2 Author: Patrick McHardy Date: Sat Aug 20 17:38:40 2005 -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 a5ea169c9581553662bb79a1c8c98fed1ee84246 Author: Alexey Dobriyan Date: Sun Aug 21 01:08:36 2005 +0400 [PATCH] freevxfs: fix breakage introduced by symlink fixes Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds db873896d168217e213902c7163fda7ee798781b Author: Linus Torvalds Date: Sat Aug 20 13:20:01 2005 -0700 befs: fix up missed follow_link declaration change We'd updated the prototype and the return value, but not the function declaration itself. 1eecd73cce4e11ba9d67ad767f92069cfba7b589 Author: Andi Kleen Date: Fri Aug 19 06:56:40 2005 +0200 [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 5e5ec10499a00bf4ce3440d5a9e1a5a176c5a640 Author: Andi Kleen Date: Fri Aug 19 06:56:04 2005 +0200 [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 916fa469ab2248d86473577dda72003df599879b Merge: b8d9598c41e999fb094d3811019248197c54274a 034ea6388a51f571b45ef1f0fa4ed4298691768e Author: Linus Torvalds Date: Fri Aug 19 19:15:57 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 b8d9598c41e999fb094d3811019248197c54274a Merge: 01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 83c4e43722a2c8a8438b8d165047720fd36aaea4 Author: Linus Torvalds Date: Fri Aug 19 18:59:49 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 01c314a0c0f6367960a7cb1ffb5796560ccaa1c1 Author: Steve Dickson Date: Fri Aug 19 17:57:48 2005 -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 cd3716ab40c6049479d29a74b29107fd7e0e1153 Author: Steven Rostedt Date: Fri Aug 19 17:57:46 2005 -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 008b150a3c4d971cd65d02d107b8fcc860bc959c Author: Al Viro Date: Sat Aug 20 00:17:39 2005 +0100 [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 cc314eef0128a807e50fa03baf2d0abc0647952c Author: Linus Torvalds Date: Fri Aug 19 18:02:56 2005 -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 2fb1e3086df9b454538491fba8121298da37cd23 Author: Al Viro Date: Fri Aug 19 22:42:16 2005 +0100 [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 83c4e43722a2c8a8438b8d165047720fd36aaea4 Author: Al Viro Date: Fri Aug 19 15:56:37 2005 -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 a3f9985843b674cbcb58f39fab8416675e7ab842 Author: David S. Miller Date: Fri Aug 19 15:55:33 2005 -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 8d5290149ee1c6a4cea5f5146d64e2a0d48f4988 Author: Ben Colline Date: Fri Aug 19 13:44:57 2005 -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 034ea6388a51f571b45ef1f0fa4ed4298691768e Author: David S. Miller Date: Fri Aug 19 12:57:31 2005 -0700 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller da6b2d01d6bd2e79fd4f7a08acd37dc4e8fcdce8 Author: Michael Chan Date: Fri Aug 19 12:54:29 2005 -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 4eaefb39528b3a78fb6a784162200b198d3e16ee Merge: 3a931d4cca1b6dabe1085cc04e909575df9219ae 30d5b64b63fa69af31b2cba32e6d71d68526eec9 Author: Tony Luck Date: Thu Aug 18 16:44:15 2005 -0700 Auto-update from upstream 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 Merge: 5fdf193b15a08f6c32ca4eb5913fa9be788e790e 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 Author: Linus Torvalds Date: Thu Aug 18 15:16:12 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 5fdf193b15a08f6c32ca4eb5913fa9be788e790e Merge: f3ed8b444781158c9c10f48a8eba6795ecec7023 2ae2d77cfa424587014cb34a89eed0ff2149fd5c Author: Linus Torvalds Date: Thu Aug 18 14:58:21 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 f3ed8b444781158c9c10f48a8eba6795ecec7023 Merge: 6fc8b9e7c60d4a3d4d7f1189f74e37651f5610e6 2cab224d1f6557e7014601f251d6a41982963e6b Author: Linus Torvalds Date: Thu Aug 18 14:57:53 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 3a931d4cca1b6dabe1085cc04e909575df9219ae Author: Tony Luck Date: Thu Aug 18 14:40:00 2005 -0700 [IA64] remove unused function __ia64_get_io_port_base Not only was this unused, but its somewhat eccentric declaration of "static inline const unsigned long" gives gcc4 heartburn. Signed-off-by: Tony Luck 6fc8b9e7c60d4a3d4d7f1189f74e37651f5610e6 Author: Herbert Xu Date: Thu Aug 18 14:36:59 2005 -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 2cab224d1f6557e7014601f251d6a41982963e6b Author: David S. Miller Date: Thu Aug 18 14:35:38 2005 -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 4aec0fb12267718c750475f3404337ad13caa8f5 Author: Ian Wienand Date: Tue Jul 19 22:32:00 2005 -0700 [IA64] Simulator bootloader fails with gcc 4 After building a fresh tree with gcc 4 I can't boot the simulator as the bootloader loader dies with loading /home/ianw/kerntest/kerncomp//build/sim_defconfig/vmlinux... failed to read phdr After some investigation I believe this is do with differences between the alignment of variables on the stack between gcc 3 and 4 and the ski simulator. If you trace through with the simulator you can see that the disk_stat structure value returned from the SSC_WAIT_COMPLETION call seems to be only half loaded. I guess it doesn't like the alignment of the input. Signed-off-by: Ian Wienand Signed-off-by: Tony Luck cb94c62c252796f42bb83fe40960d12f3ea5a82a Author: Patrick McHardy Date: Thu Aug 18 14:05:44 2005 -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 22783649568a28839c5a362f47da7819ecfcbb9f Author: Ralf Baechle Date: Thu Aug 18 14:05:18 2005 -0700 [NET]: Fix comment in loopback driver. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: David S. Miller 001dd250c1c68667a5c3b74979fa614e2edc9ceb Author: Jay Vosburgh Date: Thu Aug 18 14:04:51 2005 -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 2ae2d77cfa424587014cb34a89eed0ff2149fd5c Author: Ben Dooks Date: Sat Jul 23 17:29:38 2005 +0100 [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 9ef9ac51cc5fa5f5811230b5fb242536b636ff47 Author: Ben Dooks Date: Sat Jul 23 17:25:18 2005 +0100 [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 a4cf0761493495681d72dcc0b34efb86e94a5527 Author: Pierre Ossman Date: Mon Jul 4 00:22:53 2005 +0200 [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 852ea22ab24df4c64c0211c3b6d6358eb0e759f9 Author: Ralf Baechle Date: Tue Aug 2 11:01:27 2005 +0100 [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 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 Author: Narendra Sankar Date: Thu Aug 18 22:30:35 2005 +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 2f09a7f4af131bf23c013ead89373deba1c7593c Author: Matt Gillette Date: Thu Aug 18 22:27:07 2005 +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 b07e5eccaf512ae3209beae5cd2e3a27c92c300b Author: Grant Coady Date: Thu Aug 18 22:19:55 2005 +0200 [PATCH] ide: fix PCI_DEVIEC_ID_APPLE_UNI_N_ATA spelling Signed-off-by: Grant Coady 0ac72b351bdf29252e4181b07fa7feed8501b5d2 Author: Juha-Matti Tapio Date: Thu Aug 18 22:13:44 2005 +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 c40d3d38a8f04fff4394c7323db239bce780db60 Author: Bartlomiej Zolnierkiewicz Date: Thu Aug 18 22:09:21 2005 +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. 6be382ea0c767a81be0e7980400b9b18167b3261 Author: Andi Kleen Date: Thu Aug 18 11:24:27 2005 -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 c6a3ea22af7a2ed36afa4672a86b3a86d604db33 Author: Matt Porter Date: Thu Aug 18 11:24:26 2005 -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 28cd1d17801774561c81a5be53bfb2d632aee2a2 Author: Matt Porter Date: Thu Aug 18 11:24:25 2005 -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 2eaa297ca234eb518673b28dd6f3715d4b292e09 Author: Jeff Dike Date: Thu Aug 18 11:24:25 2005 -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 718d8989bca49761daf65f77249b0067c40756b2 Author: Al Viro Date: Thu Aug 18 11:24:23 2005 -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 024f474795af7a0d41bd6d60061d78bd66d13f56 Author: Matt Mackall Date: Thu Aug 18 11:24:19 2005 -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 6cbe9de7a4353d1a1b77887b5459ac5304c0984a Author: Michael Iatrou Date: Thu Aug 18 11:24:18 2005 -0700 [PATCH] disable debug info in radeonfb old driver This driver spams the user. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds d86c390ffbf5746df9a3cc2c5f7b75d27704580f Author: Jan Kara Date: Thu Aug 18 11:24:17 2005 -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 9223214e8d757663f366133ba5f9b58aa6b28efb Author: NeilBrown Date: Thu Aug 18 11:24:16 2005 -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 60d7603a18a5c07252e7aa0b0e2424315195d4dc Author: Robert Love Date: Thu Aug 18 11:24:14 2005 -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 f2926b7953c5f23265c062992516fed6674105db Author: Robert Love Date: Thu Aug 18 11:24:13 2005 -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 dc59250c6ebed099a9bc0a11298e2281dd896657 Author: Chuck Lever Date: Thu Aug 18 11:24:12 2005 -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 412d582ec1dd59aab2353f8cb7e74f2c79cd20b9 Author: Chuck Lever Date: Thu Aug 18 11:24:11 2005 -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 5529680981807b44abf3be30fb6d612ff04f68ff Author: Chuck Lever Date: Thu Aug 18 11:24:09 2005 -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 3c7bf1eaee1255315fc7c2c4c300295e556ef768 Author: Zwane Mwaikambo Date: Thu Aug 18 11:24:07 2005 -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 30d5b64b63fa69af31b2cba32e6d71d68526eec9 Author: Jaroslav Kysela Date: Thu Aug 18 13:16:11 2005 +0200 [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 518e6540831c69422faecceee8f964bd439ac9d0 Author: Greg KH Date: Wed Aug 17 17:33:11 2005 -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 099d44e869f1886b5eb02a5145ca97b5e4142e28 Merge: 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 481d0374217f3fefaf98efbd8d21d73c138dd928 Author: Linus Torvalds Date: Wed Aug 17 14:56:22 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6 4e6a06eec46067df3c30fe1fbc2e1a7cc37b9678 Author: David Woodhouse Date: Wed Aug 17 11:36:35 2005 +0100 [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 ac9af7cba9e642961bfdee1a1fac6060405597e5 Author: Brian King Date: Thu Aug 18 07:32:18 2005 +1000 [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 75e8727fbb3749075b6df36be636a3045ed9d515 Merge: d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 Author: Linus Torvalds Date: Wed Aug 17 13:09:38 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b Merge: c231c7db30faf93419fc22d680f74d816bea70e2 c149ec05dcd09d525e6778e339122827c7cd79b8 Author: Linus Torvalds Date: Wed Aug 17 13:08:17 2005 -0700 Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 c231c7db30faf93419fc22d680f74d816bea70e2 Author: Linus Torvalds Date: Wed Aug 17 13:07:28 2005 -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 7974b1cc7879141962999e78a6fc9a136dc4479e Merge: c4f92dba97f4e3aa757500896f87001569f4604b 62ee914ef27fded9d1c5da41e1e05c3bd175c529 Author: Linus Torvalds Date: Wed Aug 17 13:02:22 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm c4f92dba97f4e3aa757500896f87001569f4604b Author: Steven Rostedt Date: Wed Aug 17 14:25:23 2005 -0400 [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 dd12f48d4e8774415b528d3991ae47c28f26e1ac Author: Bhavesh P. Davda Date: Wed Aug 17 12:26:33 2005 -0600 [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 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 Author: Paul E. McKenney Date: Wed Aug 17 12:05:27 2005 -0700 [DECNET]: Fix RCU race condition in dn_neigh_construct(). Signed-off-by: Paul E. McKenney Signed-off-by: David S. Miller bfd272b1ca1164382eabaa9986aad822adb91eb2 Author: Patrick McHardy Date: Wed Aug 17 12:04:22 2005 -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 35d59efd105b3b7c1b5878dcc9d1749f41f9740f Author: Herbert Xu Date: Wed Aug 17 12:03:59 2005 -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 97077c4a9868fce8ac151512cde5d24fc1144f24 Author: Patrick McHardy Date: Wed Aug 17 12:03:32 2005 -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 c149ec05dcd09d525e6778e339122827c7cd79b8 Author: Tony Luck Date: Wed Aug 17 10:24:17 2005 -0700 [IA64] Updated tiger defconfig Signed-off-by: Tony Luck ade6648b3b11a5d81f6f28135193ab6d85d621db Merge: 2ad56496627630ebc99f06af5f81ca23e17e014e fad87acaea7b0965fe91f0351fdd688fc9761cbe Author: Linus Torvalds Date: Wed Aug 17 08:21:00 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 62ee914ef27fded9d1c5da41e1e05c3bd175c529 Author: Dimitry Andric Date: Wed Aug 17 13:01:19 2005 +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 22d8be866ee23bf3ad9fe867587eef5f4200bf84 Author: Sean Lee Date: Wed Aug 17 09:28:26 2005 +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 2ad56496627630ebc99f06af5f81ca23e17e014e Author: Stephen Rothwell Date: Wed Aug 17 13:01:50 2005 +1000 [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 da5ca008933b3b28303ba44d0be3372fbac7748b Author: Pete Zaitcev Date: Tue Aug 16 15:16:46 2005 -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 dc1d97e466c2836adebe5618759bfb5b35b3bc0a Author: Ping Cheng Date: Tue Aug 16 15:16:32 2005 -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 33a5c72432ef3e75dcf546bf41bcbfce697903ff Author: Jiri Slaby Date: Tue Aug 16 15:16:26 2005 -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 8cf4c19523b7694c88bba716d88fb659fa702411 Author: Kristen Accardi Date: Tue Aug 16 15:16:10 2005 -0700 [PATCH] PCI Hotplug: new contact info Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds 4b47b0eefc37fe3bf6bffb4507c8b6df5b14348d Author: Andrew Morton Date: Tue Aug 16 15:16:05 2005 -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 4602b88d9743b5f20655de8078fb42e9fd25581f Author: Kristen Accardi Date: Tue Aug 16 15:15:58 2005 -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 208f3d6175cb17772c5af202fe12373f90894ff4 Author: Maneesh Soni Date: Tue Aug 16 15:15:48 2005 -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 fad87acaea7b0965fe91f0351fdd688fc9761cbe Author: Patrick McHardy Date: Tue Aug 16 21:03:41 2005 -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 c8ac37746489f05a32a958b048f29ae45487e81e Author: Herbert Xu Date: Tue Aug 16 20:43:40 2005 -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 793245eeb97bd28e363f2b0f2e766fdbff0c9619 Author: Patrick McHardy Date: Tue Aug 16 20:39:38 2005 -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 7f09d6f935aaa91f71fe64d64013ad3bd2a9d2f4 Author: Peter Chubb Date: Tue Aug 16 17:27:00 2005 -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 7b1a843f4630867c1d686885e7af94eac137e888 Author: Greg Edwards Date: Tue Aug 16 13:06:00 2005 -0700 [IA64] Refresh arch/ia64/configs/sn2_defconfig. Signed-off-by: Greg Edwards Signed-off-by: Tony Luck 71841b8fe7dd8caffd07482cbed4a99874bfbb70 Author: Keith Owens Date: Sat Jul 30 17:52:00 2005 -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 c1ffb910f7a4e1e79d462bb359067d97ad1a8a25 Author: Prarit Bhargava Date: Tue Aug 2 10:08:00 2005 -0700 [IA64]: SN fix bus->sysdata pointer and memory cleanups The main issue is that bus_fixup calls may potentially call functions that require a valid bus->sysdata pointer. Since this is the case, we must set the bus->sysdata pointer before calling the bus_fixup functions. The remaining changes are simple fixes to make sure memory is cleaned up in the function. Signed-off-by: Prarit Bhargava Signed-off-by: Tony Luck 12aaa0855b39b5464db953fedf399fa91ee365ed Author: Zachary Amsden Date: Tue Aug 16 12:05:09 2005 -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 5153f7e6dba37390902c8fd3edc9a8cc19358ece Merge: ca27ea487ea10bd22459dbc367cf263f1e8d5228 2d610b80e954045ccfc27558f84e482709e5e5b7 Author: Linus Torvalds Date: Tue Aug 16 12:12:30 2005 -0700 Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6 481d0374217f3fefaf98efbd8d21d73c138dd928 Author: Anton Altaparmakov Date: Tue Aug 16 19:42:56 2005 +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 f7001e8f1fa5369ee24f58255726a04a2019e4bd Merge: 85f265d887d2389376f1caa191e9682085feb76e cf59001235c5a36f3e3701bd593a78cf955a4242 Author: Tony Luck Date: Tue Aug 16 11:29:57 2005 -0700 Auto-update from upstream ca27ea487ea10bd22459dbc367cf263f1e8d5228 Merge: cf59001235c5a36f3e3701bd593a78cf955a4242 fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 Author: Linus Torvalds Date: Tue Aug 16 09:43:13 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus cf59001235c5a36f3e3701bd593a78cf955a4242 Merge: 65e4308d2500e7daf60c3dccc202c61ffb066c63 e74589ac250e463973361774a90fee2c9d71da02 Author: Linus Torvalds Date: Tue Aug 16 09:31:28 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6 65e4308d2500e7daf60c3dccc202c61ffb066c63 Author: Trond Myklebust Date: Tue Aug 16 11:49:44 2005 -0400 [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 367ae3cd74bdc2ad32d71293427fec570b14ddcd Author: John Hawkes Date: Tue Aug 16 17:59:20 2005 +1000 [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 58fcb8df0bf663bb6b8f46cd3010bfe8d13d97cf Author: Trond Myklebust Date: Wed Aug 10 18:15:12 2005 -0400 [PATCH] NFS: Ensure ACL xdr code doesn't overflow. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds e74589ac250e463973361774a90fee2c9d71da02 Author: Anton Altaparmakov Date: Tue Aug 16 16:38:28 2005 +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 75cd968ab251ac84dd3a5dc252af7036dc4a64f4 Author: Linus Torvalds Date: Mon Aug 15 17:40:46 2005 -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. 85f265d887d2389376f1caa191e9682085feb76e Author: Christoph Hellwig Date: Tue Aug 9 13:38:00 2005 -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 fb80cbee4c4bfeaeb2ff6611beecfb9a2443da90 Merge: b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae 3edea4833a1efcd43e1dff082bc8001fdfe74b34 Author: Len Brown Date: Mon Aug 15 16:02:50 2005 -0400 Merge ../from-linus b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae Merge: 2ba84684e8cf6f980e4e95a2300f53a505eb794e 30e332f3307e9f7718490a706e5ce99f0d3a7b26 Author: Len Brown Date: Mon Aug 15 15:49:00 2005 -0400 Merge ../to-linus-stable/ 30e332f3307e9f7718490a706e5ce99f0d3a7b26 Author: Luming Yu Date: Fri Aug 12 00:31:00 2005 -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 54738e82755f73080e779ba0c8052e232df24d78 Author: Richard Purdie Date: Mon Aug 15 20:42:32 2005 +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 3edea4833a1efcd43e1dff082bc8001fdfe74b34 Author: Antonino A. Daplas Date: Mon Aug 15 21:29:11 2005 +0800 [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 6bd49341f2806168c877e12cefca77b93437bac2 Author: Sylvain Meyer Date: Mon Aug 15 21:27:13 2005 +0800 [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 89204c40a03346cd951e698d854105db4cfedc28 Author: John McCutchan Date: Mon Aug 15 12:13:28 2005 -0400 [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 0bf955ce98cb3cf40e20d0cc435299eb76e8819e Author: Robert Love Date: Mon Aug 15 12:27:54 2005 -0400 [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 d93742f5a73c3dff641732c029836170f86392d2 Author: Russell King Date: Mon Aug 15 16:53:38 2005 +0100 [ARM] Remove extraneous whitespace introduced in previous ARMv6 patch Signed-off-by: Russell King 498de0cc5ea3009af762dc968a46d6f5df96b67a Author: Robert Love Date: Mon Aug 15 10:57:08 2005 +0100 [ARM] Add syscall stubs for inotify and ioprio system calls Signed-off-by: Robert Love Signed-off-by: Russell King 2ba84684e8cf6f980e4e95a2300f53a505eb794e Author: Linus Torvalds Date: Sun Aug 14 18:21:30 2005 -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 b4b08e581fac8e0ba9ae348bdc13246c9798c99e Author: Linus Torvalds Date: Sun Aug 14 15:43:39 2005 -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 27876d02b30aa34bb1ad35b81ccc40c174282f31 Author: Steve French Date: Sun Aug 14 16:55:23 2005 -0500 [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 d024709deb4997aced6140a62e8ee82b10666c5f Author: Steve French Date: Sun Aug 14 16:55:23 2005 -0500 [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 1b0a74d1c002320d5488333dd9c72126af1aab02 Author: Jan Kara Date: Sat Aug 13 13:15:34 2005 +0200 [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 f73bc8cae3481adc4188a5f34a89025c10133b0a Author: Paul Mundt Date: Sat Aug 13 20:28:06 2005 +0300 [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 4bb82551e165f887448f6f61055d7bcd90aefa2a Author: Linus Torvalds Date: Sat Aug 13 14:22:59 2005 -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. fc464476aa8356f7aae8787d9b8c14aa15d166eb Merge: 691241315116b962f2161e6190f1678cc65bbe26 2da5bf80f754e28cc153362e5ed1edaa9740897a Author: Tony Luck Date: Fri Aug 12 15:13:06 2005 -0700 Auto-update from upstream 2da5bf80f754e28cc153362e5ed1edaa9740897a Author: Evgeniy Polyakov Date: Fri Aug 12 11:46:22 2005 -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 63788ea9245688772d13b979bea05bd72b239aad Merge: 349188f66da2fd88f8cb2407763051d8e136c9aa d7b9dfc8ea43936e6e8eec3040dcf4f110563868 Author: Linus Torvalds Date: Fri Aug 12 09:22:34 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 349188f66da2fd88f8cb2407763051d8e136c9aa Author: Eric W. Biederman Date: Thu Aug 11 22:26:25 2005 -0600 [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 d7b9dfc8ea43936e6e8eec3040dcf4f110563868 Author: Matt Mackall Date: Thu Aug 11 19:28:05 2005 -0700 [NETPOLL]: remove unused variable Remove unused variable Signed-off-by: Matt Mackall Signed-off-by: David S. Miller 53fb95d3c14290fd6ee808b221e35493f096246f Author: Matt Mackall Date: Thu Aug 11 19:27:43 2005 -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 2652076507b662fc88ba16c27b59c7bdd9ccd956 Author: Ingo Molnar Date: Thu Aug 11 19:26:42 2005 -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 0db1d6fc1ea051af49ebe03c503d23996a7c5bbb Author: Matt Mackall Date: Thu Aug 11 19:25:54 2005 -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 f0d3459d0722782c7d9d0e35a1ed0815e75fcde5 Author: Matt Mackall Date: Thu Aug 11 19:25:11 2005 -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 6b0b31572985c2e64f7216c798766302fb782281 Author: Matt Mackall Date: Thu Aug 11 19:24:33 2005 -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 a636e1357911afdea7c8344ee65f78d36caf3c16 Author: Jeff Moyer Date: Thu Aug 11 19:23:50 2005 -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 11513128bb66b0b09d5d0df069b58afdb01752a2 Author: Jeff Moyer Date: Thu Aug 11 19:23:04 2005 -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 a0d3bea3cf6c7c1b53a46432bd490b5dc784ca42 Author: Alexey Dobriyan Date: Thu Aug 11 16:05:50 2005 -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 7d69fa6266770eeb6317eddd46b64456e8a515bf Author: Johannes Stezenbach Date: Thu Aug 11 11:54:24 2005 +0200 [PATCH] Fix DVB URL Signed-off-by: Johannes Stezenbach Signed-off-by: Linus Torvalds 691241315116b962f2161e6190f1678cc65bbe26 Merge: 1c53e4357ec72d6114c58d20c26d00a904f55da3 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 Author: Tony Luck Date: Thu Aug 11 09:43:50 2005 -0700 pull perfmon context load into release tree b5da623ae9be680ea59f268eeb339f0acb2d88c4 Author: Herbert Xu Date: Wed Aug 10 18:32:36 2005 -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 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 Author: stephane.eranian@hp.com Date: Thu Jul 28 05:18:00 2005 -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 1c53e4357ec72d6114c58d20c26d00a904f55da3 Author: Kenji Kaneshige Date: Wed Aug 10 02:49:00 2005 -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 bc68552faad0e134eb22281343d5ae5a4873fa80 Merge: 0893dd327ffacb83dcca9033d2891d57b4024d6b 001ab02a8c04f0b4dc773c474da698ad7405ae68 Author: Linus Torvalds Date: Wed Aug 10 12:21:25 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 0893dd327ffacb83dcca9033d2891d57b4024d6b Merge: 606867443764edac5a2c542f2fa0a12ef7a7c7fd 42517438f9c1011a03e49a542cba32ac5a80dd8e Author: Linus Torvalds Date: Wed Aug 10 11:56:19 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 606867443764edac5a2c542f2fa0a12ef7a7c7fd Author: James Bottomley Date: Wed Aug 10 11:29:15 2005 -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 001ab02a8c04f0b4dc773c474da698ad7405ae68 Author: Steven Whitehouse Date: Wed Aug 10 11:32:57 2005 -0700 [DECNET]: Use sk_stream_error function rather than DECnet's own Signed-off-by: Steven Whitehouse Signed-off-by: David S. Miller 3462b925414a146d4c2252de97d20f89218d1ffb Author: Pierre Ossman Date: Mon Jul 11 14:19:35 2005 +0200 [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 e62b8b2bc73b2433239a2ac394c2fafd50c43d9e Author: Benjamin Herrenschmidt Date: Wed Aug 10 11:12:09 2005 +0200 [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 70679ee34f244499cf1c6775647895123eb1a326 Merge: 435d444a532af652ba8bdfd4db4424982bea2f69 b876386ee47e3ac9375a36e9107b8bd32e0599fc Author: Linus Torvalds Date: Wed Aug 10 11:05:56 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp 435d444a532af652ba8bdfd4db4424982bea2f69 Merge: 22d0def9d09111513f5a8d38583210620f97d710 484ae6bd9506488089c33784eff35b190fa80e03 Author: Linus Torvalds Date: Wed Aug 10 11:05:28 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm 22d0def9d09111513f5a8d38583210620f97d710 Author: Alexander Nyberg Date: Wed Aug 10 10:11:36 2005 -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 c0438174e8272d23fe43a5d3f23d777f5b412e87 Author: Ralf Baechle DL5RB Date: Wed Aug 10 10:03:20 2005 -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 42517438f9c1011a03e49a542cba32ac5a80dd8e Author: Tejun Heo Date: Wed Aug 10 13:38:27 2005 -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. fae009847c9ea3d668bbee21ce1d76764eca5039 Author: Tejun Heo Date: Sun Aug 7 14:53:40 2005 +0900 [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 48d28fd55e7fd349fb16a50244379b4da3a4943c Merge: 86b3786078d63242d3194ffc58ae8dae1d1bbef3 5bb8345db8f2aef367e0fddf99a42b7a6029b31f Author: Linus Torvalds Date: Wed Aug 10 09:36:02 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 2d610b80e954045ccfc27558f84e482709e5e5b7 Merge: 8a9cd6d676728792aaee31f30015d284acd154a3 86b3786078d63242d3194ffc58ae8dae1d1bbef3 Author: Dave Kleikamp Date: Wed Aug 10 11:15:13 2005 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp 8a9cd6d676728792aaee31f30015d284acd154a3 Author: Dave Kleikamp Date: Wed Aug 10 11:14:39 2005 -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 484ae6bd9506488089c33784eff35b190fa80e03 Author: Ben Dooks Date: Wed Aug 10 16:45:14 2005 +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 c59d071d4a32e1c45cac6d47f5b59ec36a9a997b Author: Ben Dooks Date: Wed Aug 10 16:45:14 2005 +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 8d3722667762af1490db18ba927386d3be89a32b Author: Nicolas Pitre Date: Wed Aug 10 16:45:13 2005 +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 6626a7076d39f0a18156cdd97d4e2cbef91ad701 Author: Russell King Date: Wed Aug 10 16:18:35 2005 +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 1b9749e7f15bf2db19f5d201f88401c7517910b7 Author: Russell King Date: Wed Aug 10 16:15:32 2005 +0100 [ARM] Use #defined constants for manipulating v6 hardware PTE bits Signed-off-by: Russell King b876386ee47e3ac9375a36e9107b8bd32e0599fc Author: Russell King Date: Wed Aug 10 14:52:52 2005 +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 3c4ee4e2520775896efc6ab850c4c27971fbcf2a Author: Russell King Date: Wed Aug 10 14:41:45 2005 +0100 [ARM SMP] Only enable V6K instructions on V6 MP core CPUs Signed-off-by: Russell King 86b3786078d63242d3194ffc58ae8dae1d1bbef3 Author: Christoph Lameter Date: Tue Aug 9 19:59:21 2005 -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 aeb3f76350e78aba90653b563de6677b442d21d6 Author: Michael Krufky Date: Tue Aug 9 17:48:54 2005 -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 e179d8b0552e2fdb45c6022c589af945f8cbecbe Author: Michael Krufky Date: Tue Aug 9 17:48:54 2005 -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 dc9352a42c6de578c932313448257cf246b2b75f Author: Markus Lidel Date: Tue Aug 9 14:30:57 2005 -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 a7df26da158ad64d56cc32934aa38a07d03a6fc9 Merge: 68e681e87faa142bde356aeefe619c42275ac98e fb573856b2d82926b36ed059899d883474a3b9eb Author: Linus Torvalds Date: Tue Aug 9 16:03:19 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 68e681e87faa142bde356aeefe619c42275ac98e Merge: 25f13053651569bd0c87927ff49d07d9225feadb 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 Author: Linus Torvalds Date: Tue Aug 9 16:02:15 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 25f13053651569bd0c87927ff49d07d9225feadb Merge: db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 d64d3873721cfe870d49d73c3744f06260779ce7 Author: Linus Torvalds Date: Tue Aug 9 16:00:05 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 d64d3873721cfe870d49d73c3744f06260779ce7 Author: Andrew Morton Date: Tue Aug 9 15:29:19 2005 -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 3501466941347f0e1992b2672affb3feb92925fd Author: David S. Miller Date: Tue Aug 9 14:57:12 2005 -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 38c1844b3120e04b7f5bb9c18ebbc19883d1e1d6 Author: David S. Miller Date: Tue Aug 9 14:43:14 2005 -0700 [SPARC]: envctrl: ERR_PTR() --> PTR_ERR() Fix thinko in Christoph's changes. Signed-off-by: David S. Miller 4875ccdb304775e9fd830f644643a1513357e043 Author: Christoph Hellwig Date: Tue Aug 9 14:39:10 2005 -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 bc2406684b5929cea5d40b9cc4fd872816956779 Author: Christoph Hellwig Date: Tue Aug 9 13:32:25 2005 -0700 [SPARC]: Use kthread infrastructure in bbc_envctrl Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller 218b29e0c3995ee15782de55ad1dd74cce1a728d Author: Christoph Hellwig Date: Tue Aug 9 12:30:07 2005 -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 db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 Author: Markus Lidel Date: Tue Aug 9 10:08:03 2005 -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 36d2f5a18205dfc2fac1e3541d324ce186f418cb Author: Kumar Gala Date: Tue Aug 9 10:08:02 2005 -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 311c46273f0e8b140d4cc68e13128cbc22114807 Author: Kumar Gala Date: Tue Aug 9 10:08:00 2005 -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 3077a260e9f316b611436b1506eec9cc5c4f8aa6 Author: Paul Jackson Date: Tue Aug 9 10:07:59 2005 -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 a242b44da6feb604c4c659b78f63dedb69b2d4a3 Author: Ralf Baechle Date: Tue Aug 9 10:07:57 2005 -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 01df0e3a79d3913df178e9a1047ade425a7c118f Author: Wim Van Sebroeck Date: Tue Aug 9 10:07:56 2005 -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 5bb8345db8f2aef367e0fddf99a42b7a6029b31f Author: Salyzyn, Mark Date: Tue Aug 9 12:57:58 2005 -0400 [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 00dd1e433967872f3997a45d5adf35056fdf2f56 Author: John McCutchan Date: Mon Aug 8 22:13:05 2005 -0400 [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 dc836b5b6fcde95f750a4790d8200fabaf563dc9 Author: Linus Torvalds Date: Mon Aug 8 18:46:09 2005 -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. 138b9dd1fd7b44176af4f3b672060c790b0eaf55 Author: Dave Jones Date: Mon Aug 8 16:13:15 2005 -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 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 Merge: 03c6b749b364fe7b8e47ed8e1ce26baca167c322 ca9334523c853e407da7b3a0bd02f54d0fa59414 Author: Linus Torvalds Date: Mon Aug 8 16:06:01 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 fb573856b2d82926b36ed059899d883474a3b9eb Author: Ken Chen Date: Mon Aug 8 15:25:00 2005 -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 03c6b749b364fe7b8e47ed8e1ce26baca167c322 Author: Olaf Hering Date: Mon Aug 8 14:49:18 2005 -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 5e708484d710bcbb44893400f429579f5728cd7d Author: Kumar Gala Date: Mon Aug 8 14:49:17 2005 -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 5c44cd2afad3f7b015542187e147a820600172f1 Author: James.Smart@Emulex.Com Date: Fri Jun 10 22:24:30 2005 -0400 [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 ca9334523c853e407da7b3a0bd02f54d0fa59414 Author: Heikki Orsila Date: Mon Aug 8 14:26:52 2005 -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 4d479e40e1748a877a24015fc6727b27b77110cd Author: David S. Miller Date: Mon Aug 8 13:48:02 2005 -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 b612cacb02f0fb58f07a9002c7719a901882718c Merge: 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 Author: Linus Torvalds Date: Mon Aug 8 12:19:24 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a Author: John McCutchan Date: Mon Aug 8 13:52:16 2005 -0400 [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 1963c907b21e140082d081b1c8f8c2154593c7d7 Author: Michael Krufky Date: Mon Aug 8 09:22:43 2005 -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 66aea23ff84ca81bfaeaf7d63e248b873f5c2616 Author: Cornelia Huck Date: Mon Aug 8 09:22:36 2005 -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 8b83bc77bf77cc8459cb94e52b08e775104c4c48 Author: Harald Welte Date: Mon Aug 8 11:50:55 2005 +0200 [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 48de5beeb0ee821859c79ba5b9462654604d8bf3 Author: James Morris Date: Mon Aug 8 10:29:08 2005 -0400 [PATCH] Update contact info for James Morris 6d85f29bb54235d2e184e7155dcd4de908324fe6 Author: Ivan Kokshaysky Date: Mon Aug 8 12:55:54 2005 +0400 [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 db6778db7eb1d974e1ae0da326530f09c13585ac Author: Antonino Daplas Date: Mon Aug 8 14:22:43 2005 +0800 [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 0f0767c67a497173294bdf6725a3d85f7f29e397 Author: Paul Mackerras Date: Mon Aug 8 14:16:43 2005 +1000 [PATCH] ppc64: update defconfigs Update the default/example configs for ppc64. Pretty boring... Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds 2c875bbda9303b359af94f671d25639840ce2a59 Author: Arnd Bergmann Date: Mon Aug 8 14:12:42 2005 +1000 [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 9c472dd9197429a37691e91c938660a062bf20b0 Author: James Bottomley Date: Mon Aug 8 11:51:38 2005 -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 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 Author: Christoph Hellwig Date: Sun Aug 7 14:23:42 2005 +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 fc1df37e3b195cb73ecb14c30d41b7aace3f844a Author: Russell King Date: Sun Aug 7 14:20:26 2005 +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 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788 Author: David S. Miller Date: Sat Aug 6 06:35:48 2005 -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 6fc0b4a7a73a81e74d0004732df358f4f9975be2 Author: Herbert Xu Date: Sat Aug 6 06:33:15 2005 -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 a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e Merge: 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd 1c5ad84516ae7ea4ec868436a910a6bd8d20215a Author: Dave Kleikamp Date: Thu Aug 4 15:56:15 2005 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd Author: Dave Kleikamp Date: Mon Aug 1 16:54:26 2005 -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 da28c12089dfcfb8695b6b555cdb8e03dda2b690 Merge: 6de7dc2c4c713d037c19aa1e310d240f16973414 577a4f8102d54b504cb22eb021b89e957e8df18f Author: Dave Kleikamp Date: Thu Jul 28 09:03:36 2005 -0500 Merge with /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp 6de7dc2c4c713d037c19aa1e310d240f16973414 Merge: cbc3d65ebcb0c494183d45cf202a53352cbf3871 9e566d8bd61f939b7f5d7d969f5b178571471cf9 Author: Dave Kleikamp Date: Wed Jul 27 12:50:08 2005 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp cbc3d65ebcb0c494183d45cf202a53352cbf3871 Author: Dave Kleikamp Date: Wed Jul 27 09:17:57 2005 -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 de8fd087b280797977b012a4275ee53ff2999f3f Merge: 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 Author: Dave Kleikamp Date: Tue Jul 26 09:55:10 2005 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp