commit ef7d1b244fa6c94fb76d5f787b8629df64ea4046 tree eb6b35bb250f46d75853764bd9309c75e4f03c72 parent ed0da6fc9d3096f54c4a76737eeae57ac81418cf parent 78eb887733ec8ff5d6e6c69e3c32a187a9303622 author Greg Kroah-Hartman Fri, 18 Aug 2006 11:02:52 -0700 committer Greg Kroah-Hartman Fri, 18 Aug 2006 11:02:52 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit ed0da6fc9d3096f54c4a76737eeae57ac81418cf tree 3bf45a192d991c5a5c80ac86eb333f9a4f796044 parent 774bd8613d0188cda72408f8ffce258d73953cad parent 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5 author Greg Kroah-Hartman Fri, 18 Aug 2006 09:20:04 -0700 committer Greg Kroah-Hartman Fri, 18 Aug 2006 09:20:04 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc commit 78eb887733ec8ff5d6e6c69e3c32a187a9303622 tree 1028d082b0240f04f1b0d8f91b9e2813e329710c parent 8311731afc439f508ab4d759edadedae75afb73e author Herbert Xu Thu, 17 Aug 2006 18:22:32 -0700 committer David S. Miller Thu, 17 Aug 2006 18:22:32 -0700 [BRIDGE]: Disable SG/GSO if TX checksum is off When the bridge recomputes features, it does not maintain the constraint that SG/GSO must be off if TX checksum is off. This patch adds that constraint. On a completely unrelated note, I've also added TSO6 and TSO_ECN feature bits if GSO is enabled on the underlying device through the new NETIF_F_GSO_SOFTWARE macro. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8311731afc439f508ab4d759edadedae75afb73e tree c1f63cd1d4e10b6a62c3a62e2407c998d9fbaec6 parent d205dc40798d97d63ad348bfaf7394f445d152d4 author Patrick McHardy Thu, 17 Aug 2006 18:13:53 -0700 committer David S. Miller Thu, 17 Aug 2006 18:13:53 -0700 [NETFILTER]: ip_tables: fix table locking in ipt_do_table table->private might change because of ruleset changes, don't use it without holding the lock. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d205dc40798d97d63ad348bfaf7394f445d152d4 tree 603d58aaacec053300396db71b7143ea115ee902 parent 6e8fcbf64024f9056ba122abbb66554aa76bae5d author Patrick McHardy Thu, 17 Aug 2006 18:12:38 -0700 committer David S. Miller Thu, 17 Aug 2006 18:12:38 -0700 [NETFILTER]: ctnetlink: fix deadlock in table dumping ip_conntrack_put must not be called while holding ip_conntrack_lock since destroy_conntrack takes it again. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5 tree d9b8ab7ddcdfd2a97b3dcb5aca8ecfdbe0e8c0ca parent 5315862045c5dc5dfe0754fbd07df1350180628a author Jon Loeliger Thu, 17 Aug 2006 12:24:42 -0500 committer Paul Mackerras Fri, 18 Aug 2006 10:08:37 +1000 [POWERPC] Fix the mpc8641_hpcn.dts file. Add 'linux,phandle' entry to i8259@4d0 node. Signed-off-by: Zhang Wei Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 5315862045c5dc5dfe0754fbd07df1350180628a tree 233c42e4d675a73e0024a154ae0d162943a22133 parent 707ba16f0ffed3b83ced3c7f4d4d332a70f8b41d author Jon Loeliger Wed, 09 Aug 2006 10:37:28 -0500 committer Paul Mackerras Fri, 18 Aug 2006 10:08:36 +1000 [POWERPC] Offer PCI as a CONFIG choice for PPC_86xx. Also fix 80-column run-over. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 707ba16f0ffed3b83ced3c7f4d4d332a70f8b41d tree b09fd11a02e17ab66a9bafbf53463e03dc713bb8 parent f583165f6a926e9f27ff8d15c0e4b22e83f0d599 author Jon Loeliger Thu, 03 Aug 2006 16:27:57 -0500 committer Paul Mackerras Fri, 18 Aug 2006 10:02:45 +1000 [POWERPC] Add MPC8641 HPCN Device Tree Source file. As per list discussion, let's add device tree source files under powerpc/boot/dts. If nothing else, it is a starting point. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit f583165f6a926e9f27ff8d15c0e4b22e83f0d599 tree d4765340b1184a4a94565bbad197cb7b2488d6d1 parent 9a936a2e0526089194159eae31238e36b1c19e74 author Jon Loeliger Thu, 17 Aug 2006 08:42:35 -0500 committer Paul Mackerras Fri, 18 Aug 2006 09:50:16 +1000 [POWERPC] Convert to mac-address for ethernet MAC address data. Also accept "local-mac-address". However the old "address" is now obsolete, but accepted for backwards compatibility. It should be removed after all device trees have been converted to use "mac-address". Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 6e8fcbf64024f9056ba122abbb66554aa76bae5d tree 61fec2bd4815d30110dc2ba7da3b7578fb08a0d8 parent acd6e00b8e4db542cb6bc9ddfbb4e18bbe29ce4d author Alexey Kuznetsov Thu, 17 Aug 2006 16:44:46 -0700 committer David S. Miller Thu, 17 Aug 2006 16:44:46 -0700 [IPV4]: severe locking bug in fib_semantics.c Found in 2.4 by Yixin Pan . > When I read fib_semantics.c of Linux-2.4.32, write_lock(&fib_info_lock) = > is used in fib_release_info() instead of write_lock_bh(&fib_info_lock). = > Is the following case possible: a BH interrupts fib_release_info() while = > holding the write lock, and calls ip_check_fib_default() which calls = > read_lock(&fib_info_lock), and spin forever. Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit acd6e00b8e4db542cb6bc9ddfbb4e18bbe29ce4d tree f644e1ee2a5d85b1d680897105ad8f38a562cfc1 parent c7fa9d189e93877a1fa08ab00f230e0689125e45 author David L Stevens Thu, 17 Aug 2006 16:27:39 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:57 -0700 [MCAST]: Fix filter leak on device removal. This fixes source filter leakage when a device is removed and a process leaves the group thereafter. This also includes corresponding fixes for IPv6 multicast source filters on device removal. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit c7fa9d189e93877a1fa08ab00f230e0689125e45 tree 26aab5d6e79f8c25c89a8a70fa18c9c29819b8f0 parent d4274b51a5c8147b5341e15927368e75b632d297 author David S. Miller Tue, 15 Aug 2006 16:34:13 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:56 -0700 [NET]: Disallow whitespace in network device names. It causes way too much trouble and confusion in userspace. Signed-off-by: David S. Miller commit d4274b51a5c8147b5341e15927368e75b632d297 tree fbf4f8b5929bc89acada9b3cbfc588cf1f159e92 parent c0956bd25161bff45304d482cda51ca4b3b572f1 author Panagiotis Issaris Tue, 15 Aug 2006 16:01:07 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:55 -0700 [PPP]: handle kmalloc failures and convert to using kzalloc The PPP code contains two kmalloc()s followed by memset()s without handling a possible memory allocation failure. (Suggested by Joe Perches). And furthermore, conversions from kmalloc+memset to kzalloc. [akpm@osdl.org: fix error-path leak] [akpm@osdl.org: cleanups] [paulus@samba.org: don't add useless printk and cardmap_destroy calls] Signed-off-by: Panagiotis Issaris Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras Signed-off-by: David S. Miller commit c0956bd25161bff45304d482cda51ca4b3b572f1 tree d8cb679684f4a4e9a3cdc7808ed26cfd0f12b43b parent b9c6e3e96669ade31afd3a39f17393e577b609c5 author Ralf Hildebrandt Tue, 15 Aug 2006 02:12:43 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:54 -0700 [PKT_SCHED] cls_u32: Fix typo. Signed-off-by: Ralf Hildebrandt Signed-off-by: David S. Miller commit b9c6e3e96669ade31afd3a39f17393e577b609c5 tree a503803033ea92a516c41312f6bdac65e5bd80d9 parent 932f3772cf76cc1b1fd1538ceee3edba9bf2164f author Kevin Hilman Tue, 15 Aug 2006 02:02:33 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:53 -0700 [ATM]: Compile error on ARM atm_proc_exit() is declared as __exit, and thus in .exit.text. On some architectures (ARM) .exit.text is discarded at compile time, and since atm_proc_exit() is called by some other __init functions, it results in a link error. Signed-off-by: Kevin Hilman Signed-off-by: David S. Miller commit 932f3772cf76cc1b1fd1538ceee3edba9bf2164f tree f9ad57d1369359d30fbab271cb736519c0606e20 parent 2f8af120a159a843948749ea88bcacda9779b132 author Michael Chan Tue, 15 Aug 2006 01:39:36 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:52 -0700 [BNX2]: Convert to netdev_alloc_skb() Convert dev_alloc_skb() to netdev_alloc_skb() and increase default rx ring size to 255. The old ring size of 100 was too small. Update version to 1.4.44. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2f8af120a159a843948749ea88bcacda9779b132 tree e633037a72db856b8078e814e3451dd8f44c14de parent fb33f82568d32016b3b3c00819574f9526e52be3 author Michael Chan Tue, 15 Aug 2006 01:39:10 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:51 -0700 [BNX2]: Fix tx race condition. Fix a subtle race condition between bnx2_start_xmit() and bnx2_tx_int() similar to the one in tg3 discovered by Herbert Xu: CPU0 CPU1 bnx2_start_xmit() if (tx_ring_full) { tx_lock bnx2_tx() if (!netif_queue_stopped) netif_stop_queue() if (!tx_ring_full) update_tx_ring netif_wake_queue() tx_unlock } Even though tx_ring is updated before the if statement in bnx2_tx_int() in program order, it can be re-ordered by the CPU as shown above. This scenario can cause the tx queue to be stopped forever if bnx2_tx_int() has just freed up the entire tx_ring. The possibility of this happening should be very rare though. The following changes are made, very much identical to the tg3 fix: 1. Add memory barrier to fix the above race condition. 2. Eliminate the private tx_lock altogether and rely solely on netif_tx_lock. This eliminates one spinlock in bnx2_start_xmit() when the ring is full. 3. Because of 2, use netif_tx_lock in bnx2_tx_int() before calling netif_wake_queue(). 4. Add memory barrier to bnx2_tx_avail(). 5. Add bp->tx_wake_thresh which is set to half the tx ring size. 6. Check for the full wake queue condition before getting netif_tx_lock in tg3_tx(). This reduces the number of unnecessary spinlocks when the tx ring is full in a steady-state condition. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit fb33f82568d32016b3b3c00819574f9526e52be3 tree dea58578fe7ae7b0fd3f375983e5544cd9c1c03c parent bb699cbca0096aa3f5f750264ec0af080732375a author Jan "Yenya" Kasprzak Tue, 15 Aug 2006 01:33:50 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:50 -0700 [NET]: Terminology in ip-sysctl.txt this minor patch fixes the description of net.ipv4.tcp_mem sysctl in ip-sysctl.txt - the headline names the values "min, pressure, max", while the description uses the "low, pressure, high" values. Both tcp_rmem and tcp_wmem descriptions use the "min, pressure, max" values, so I have changed the tcp_mem to match this and not vice versa. Signed-off-by: Jan "Yenya" Kasprzak Signed-off-by: David S. Miller commit bb699cbca0096aa3f5f750264ec0af080732375a tree 4340b45f9750f7855abe937ff9c5c1427166e48a parent 640c41c77a96dbbfb74d40ae86ab75b759afb911 author Michal Ruzicka Tue, 15 Aug 2006 00:20:17 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:49 -0700 [IPV4]: Possible leak of multicast source filter sctructure There is a leak of a socket's multicast source filter list structure on closing a socket with a multicast source filter set on an interface that does not exist any more. Signed-off-by: Michal Ruzicka Acked-by: David L Stevens Signed-off-by: David S. Miller commit 640c41c77a96dbbfb74d40ae86ab75b759afb911 tree 58c7ae0097b2d5a2b724ffb36edcd3a3ab18ba05 parent deb47c66e12a645f7eec9b1c153c05ed47989439 author Ingo Molnar Tue, 15 Aug 2006 00:06:56 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:48 -0700 [IPV6] lockdep: annotate __icmpv6_socket Split off __icmpv6_socket's sk->sk_dst_lock class, because it gets used from softirqs, which is safe for __icmpv6_sockets (because they never get directly used via userspace syscalls), but unsafe for normal sockets. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Acked-by: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit deb47c66e12a645f7eec9b1c153c05ed47989439 tree 388b5f4f24bc74fc03fcf3d67f3ae1c65f356177 parent 855751125093f758871b70da2951d8b92b6368cc author Andrew Morton Tue, 15 Aug 2006 00:04:56 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:47 -0700 [NETFILTER]: xt_physdev build fix It needs netfilter_bridge.h for brnf_deferred_hooks Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 855751125093f758871b70da2951d8b92b6368cc tree 6c9e71da19a4fa164380c25c0d443f4eb965c917 parent 7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176 author Suresh Siddha Tue, 15 Aug 2006 00:03:01 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:47 -0700 [NET]: Fix potential stack overflow in net/core/utils.c On High end systems (1024 or so cpus) this can potentially cause stack overflow. Fix the stack usage. Signed-off-by: Suresh Siddha Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176 tree 09cf48c5f48bdee89b7a2579ba4c7b072ca842e9 parent 774bd8613d0188cda72408f8ffce258d73953cad author David S. Miller Mon, 14 Aug 2006 17:08:36 -0700 committer David S. Miller Thu, 17 Aug 2006 16:29:46 -0700 [VLAN]: Make sure bonding packet drop checks get done in hwaccel RX path. Since __vlan_hwaccel_rx() is essentially bypassing the netif_receive_skb() call that would have occurred if we did the VLAN decapsulation in software, we are missing the skb_bond() call and the assosciated checks it does. Export those checks via an inline function, skb_bond_should_drop(), and use this in __vlan_hwaccel_rx(). Signed-off-by: David S. Miller commit 9a936a2e0526089194159eae31238e36b1c19e74 tree fbc8063ccd2c78eeb135047f5a603b6f0d7b8959 parent e5c14ce118ab6a96afb2af5c4ec9727b03ab1936 author Olof Johansson Sun, 06 Aug 2006 20:51:25 -0500 committer Paul Mackerras Fri, 18 Aug 2006 07:23:29 +1000 [POWERPC] powerpc: Clear HID0 attention enable on PPC970 at boot time Clear HID0[en_attn] at CPU init time on PPC970. Closes CVE-2006-4093. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit e5c14ce118ab6a96afb2af5c4ec9727b03ab1936 tree 8533e1253717881dc93bca17537d4ff9418fabdc parent 83db3dde2604d48e30a468c82da163dd1a8602b3 author Benjamin Herrenschmidt Thu, 17 Aug 2006 03:59:27 +0200 committer Paul Mackerras Thu, 17 Aug 2006 16:41:11 +1000 [POWERPC] Fix irq radix tree remapping typo The code for using the radix tree for reverse mapping of interrupts has a typo that causes it to create incorrect mappings if the software and hardware numbers happen to be different. This would, among others, cause the IDE interrupt to fail on js20's. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 83db3dde2604d48e30a468c82da163dd1a8602b3 tree 6955ecdc6b0901da808686a2e9e07a3646008aac parent b6f35b4966e0ae59cec45e5292b100698d12dc5f author Ananth N Mavinakayanahalli Fri, 11 Aug 2006 17:01:34 +0530 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] kprobes: Fix possible system crash during out-of-line single-stepping - On archs that have no-exec support, we vmalloc() a executable scratch area of PAGE_SIZE and divide it up into an array of slots of maximum instruction size for that arch - On a kprobe registration, the original instruction is copied to the first available free slot, so if multiple kprobes are registered, chances are, they get contiguous slots - On POWER4, due to not having coherent icaches, we could hit a situation where a probe that is registered on one processor, is hit immediately on another. This second processor could have fetched the stream of text from the out-of-line single-stepping area *before* the probe registration completed, possibly due to an earlier (and a different) kprobe hit and hence would see stale data at the slot. Executing such an arbitrary instruction lead to a problem as reported in LTC bugzilla 23555. The correct solution is to call flush_icache_range() as soon as the instruction is copied for out-of-line single-stepping, so the correct instruction is seen on all processors. Thanks to Will Schmidt who tracked this down. Signed-off-by: Ananth N Mavinakayanahalli Acked-by: Will Schmidt Signed-off-by: Paul Mackerras commit b6f35b4966e0ae59cec45e5292b100698d12dc5f tree 5ff3b2832c1c3eebbef699df710068ab106ab2db parent 47585d8f5dea10dea49c948f1fb13ef7632409c7 author Michael Ellerman Wed, 05 Jul 2006 14:39:43 +1000 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] Make crash.c work on 32-bit and 64-bit To compile kexec on 32-bit we need a few more bits and pieces. Rather than add empty definitions, we can make crash.c work on 32-bit, with only a couple of kludges. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 47585d8f5dea10dea49c948f1fb13ef7632409c7 tree d9386ca930b7470e64f3d60076e3cf72f1b22c75 parent 90bdde362cc506173c1d18b8f516b18e5b228e96 author Michael Ellerman Wed, 05 Jul 2006 14:39:42 +1000 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] Move some kexec logic into machine_kexec.c We're missing a few functions for kexec to compile on 32-bit. There's nothing really 64-bit specific about the 64-bit versions, so make them generic rather than adding empty definitions for 32-bit. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 90bdde362cc506173c1d18b8f516b18e5b228e96 tree 38d9739db7292724c4577790483d7f551bec74fc parent eac8392f9591b359847b8a6abb75ca60967bcecd author Will Schmidt Tue, 08 Aug 2006 09:40:00 -0500 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] update {g5,iseries,pseries}_defconfigs Updating the defconfigs for iseries, pseries, and G5. Sticking with the defaults, with the following exceptions: I've turned off HW_RANDOM for all three configs. For G5, I've enabled SND_AOA and friends as modules; this includes the FABRIC_LAYOUT, ONYX, TAS, TOONIE and SOUNDBUS* config options. Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit eac8392f9591b359847b8a6abb75ca60967bcecd tree b4f834392fe4021bbace3c0f58ad01581cfd844e parent 81b73dd92b97423b8f5324a59044da478c04f4c4 author David Wilder Thu, 29 Jun 2006 15:17:30 -0700 committer Paul Mackerras Thu, 17 Aug 2006 16:41:10 +1000 [POWERPC] Make secondary CPUs call into kdump on reset exception In the case of a system hang, the user will invoke soft-reset to initiate the kdump boot. If xmon is enabled, the CPU(s) enter into the xmon debugger. Unfortunately, the secondary CPU(s) will return to the hung state when they exit from the debugger (returned from die() -> system_reset_exception()). This causes a problem in kdump since the hung CPU(s) will not respond to the IPI sent from kdump. This patch fixes the issue by calling crash_kexec_secondary() directly from system_reset_exception() without returning to the previous state. These secondary CPUs wait 5ms until the kdump boot is started by the primary CPU. In the case we exited from the debugger to "recover" (command 'x' in xmon) the primary and the secondary CPUs will all return from die() -> system_reset_exception() ->crash_kexec_secondary() wait 5ms, then return to the previous state. A kdump boot is not started in this case. Signed-off-by: Haren Myneni Signed-off-by: David Wilder Signed-off-by: Paul Mackerras commit 774bd8613d0188cda72408f8ffce258d73953cad tree b5f2eaeecd41c868d83d6aa443da776852cd4c95 parent 223ddcea898940b0b02bd6e624dbba3507c97365 parent c9eca0b91015bc685c2f35a50efc63d73fdf943a author Greg Kroah-Hartman Wed, 16 Aug 2006 12:41:16 -0700 committer Greg Kroah-Hartman Wed, 16 Aug 2006 12:41:16 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 commit c9eca0b91015bc685c2f35a50efc63d73fdf943a tree 0922f5cbb51d2dfca8ff14df625beadf734ec269 parent 9ee4e3365dd0dab4c1e02fe44dc08a223b826c72 author Sam Ravnborg Wed, 16 Aug 2006 21:14:08 +0200 committer Sam Ravnborg Wed, 16 Aug 2006 21:14:08 +0200 kbuild: correct assingment to CFLAGS with CROSS_COMPILE Some architectures change $CC in arch/$(ARCH)/Makefile mips is one example. That have impact on what options are supported by gcc so move all $(call cc-option, ...) after include of arch specific Makefile. Signed-off-by: Sam Ravnborg commit 223ddcea898940b0b02bd6e624dbba3507c97365 tree 3c88d52453521b143848fed844142ac5ea46fe51 parent ca412cc992c3226239dd3bf896681bbf30e1b444 parent 3e03a2fcb2c031062f9bf698ce999b77cd80aec4 author Greg Kroah-Hartman Wed, 16 Aug 2006 08:51:04 -0700 committer Greg Kroah-Hartman Wed, 16 Aug 2006 08:51:04 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 commit 3e03a2fcb2c031062f9bf698ce999b77cd80aec4 tree a65228d2f8c2466410b2ae5aa26f0637343fd456 parent b18a60e7c2a7f2a17dbd57885621a42d546e2f7d author Heiko Carstens Wed, 16 Aug 2006 13:49:37 +0200 committer Martin Schwidefsky Wed, 16 Aug 2006 13:49:37 +0200 [S390] kernel page table allocation. Don't waste DMA capable pages for identity mapping page tables. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b18a60e7c2a7f2a17dbd57885621a42d546e2f7d tree ca41788f01ae5d6c268a1b7992682ea9de0ea563 parent 2f6c55fc3109bcfa1bb1a112c825e07212c20f37 author Peter Oberparleiter Wed, 16 Aug 2006 13:49:33 +0200 committer Martin Schwidefsky Wed, 16 Aug 2006 13:49:33 +0200 [S390] inaccessible PAV alias devices on LPAR. In some situations PAV alias devices on LPAR are not accessible. The initialization procedure required to enable access to PAV alias devices has to be performed per storage server subsystem and not only once per storage server. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 2f6c55fc3109bcfa1bb1a112c825e07212c20f37 tree 9ad93064df1939b5167b1240384da368c7eae410 parent d0710c7c9eea2145a0614f39dbe9dc8cb4ae14da author Heiko Carstens Wed, 16 Aug 2006 13:49:27 +0200 committer Martin Schwidefsky Wed, 16 Aug 2006 13:49:27 +0200 [S390] dasd slab cache alignment. The dasd_page_cache should return page addresses and therefore the cache must be created with an alignment of PAGE_SIZE. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ca412cc992c3226239dd3bf896681bbf30e1b444 tree 5b5fd9becdfeda652173ada495b7738988211c7b parent e0e92632715f08dddeddb72b76e04c20126e1f67 parent 2621e2a155140b01c6ff57b3863cda2922c2c8bd author Greg Kroah-Hartman Wed, 16 Aug 2006 01:38:39 -0700 committer Greg Kroah-Hartman Wed, 16 Aug 2006 01:38:39 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog commit e0e92632715f08dddeddb72b76e04c20126e1f67 tree 4b596e9b32a58f7c2db6e8a123f4d02007c539c0 parent 80914d97aa0c61fbfd8eadd120c863b6229f0809 author Hans de Goede Tue, 15 Aug 2006 12:09:27 +0200 committer Greg Kroah-Hartman Tue, 15 Aug 2006 12:53:09 -0700 [PATCH] PATCH: 1 line 2.6.18 bugfix: modpost-64bit-fix.patch There is a small but annoying bug in scripts/mod/file2alias.c which causes it to generate invalid aliases for input devices on 64 bit archs. This causes joydev.ko to not be automaticly loaded when inserting a joystick, resulting in a non working joystick (for the average user). In scripts/mod/file2alias.c is the following code for generating the input aliases: static void do_input(char *alias, kernel_ulong_t *arr, unsigned int min, unsigned int max) { unsigned int i; for (i = min; i < max; i++) if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG))) sprintf(alias + strlen(alias), "%X,*", i); } On 32 bits systems, this correctly generates "0,*" for the first alias, "8,*" for the second etc. However on 64 bits it generates: "0,*20,*" resp "8,*28,*" Notice how it adds 20 + first entry (hex) ! to the list of hex codes, which is 32 more then the first entry, thus is because the bit test above wraps at 32 bits instead of 64. scripts/mod/file2alias.c, line 379 reads: if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG))) That should be: if (arr[i / BITS_PER_LONG] & (1L << (i%BITS_PER_LONG))) Notice the added 'L' after the 1, otherwise that is an 32 bit int instead of a 64 bit long, and when that int gets shifted >= 32 times, appearantly the number by which to shift is wrapped at 5 bits ( % 32) causing it to test a bit 32 bits too low. The patch below makes the nescesarry 1 char change :) Signed-off-by: Hans de Goede Acked-by: Rusty Russell Signed-off-by: Greg Kroah-Hartman commit 80914d97aa0c61fbfd8eadd120c863b6229f0809 tree 4d4d08a8ccbfcdabb40cc457badfd053056a7bdd parent 74361cb6828398a96167b3234e186fbd731e5f30 parent 883d4cae4a2b01a05193cf2665c77b7489a8b6a0 author Greg Kroah-Hartman Tue, 15 Aug 2006 12:31:36 -0700 committer Greg Kroah-Hartman Tue, 15 Aug 2006 12:31:36 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 commit 2621e2a155140b01c6ff57b3863cda2922c2c8bd tree e66b4cffbd870e4e9244a4b48442b4908255a9ff parent 9f737633e6ee54fc174282d49b2559bd2208391d author Matt LaPlante Wed, 05 Jul 2006 01:20:51 +0000 committer Wim Van Sebroeck Tue, 15 Aug 2006 11:17:22 +0200 [WATCHDOG] Kconfig typos fix. Three typos in drivers/char/watchdog/Kconfig... Signed-off-by: Matt LaPlante Signed-off-by: Wim Van Sebroeck commit 74361cb6828398a96167b3234e186fbd731e5f30 tree 4455618d0f6c8f4e17484180a8f69b529c04076c parent 1d7ea7324ae7a59f8e17e4ba76a2707c1e6f24d2 author Trond Myklebust Mon, 14 Aug 2006 08:54:48 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 13:10:59 -0700 [PATCH] fcntl(F_SETSIG) fix fcntl(F_SETSIG) no longer works on leases because lease_release_private_callback() gets called as the lease is copied in order to initialise it. The problem is that lease_alloc() performs an unnecessary initialisation, which sets the lease_manager_ops. Avoid the problem by allocating the target lease structure using locks_alloc_lock(). Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1d7ea7324ae7a59f8e17e4ba76a2707c1e6f24d2 tree 902b646ed70af86481a77a67582b79e67264a481 parent 9b41ea7289a589993d3daabc61f999b4147872c4 author Alexander Zarochentsev Sun, 13 Aug 2006 23:24:27 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] fuse: fix error case in fuse_readpages Don't let fuse_readpages leave the @pages list not empty when exiting on error. [akpm@osdl.org: kernel-doc fixes] Signed-off-by: Alexander Zarochentsev Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9b41ea7289a589993d3daabc61f999b4147872c4 tree 35a79670ca4493832f1da026a047e3fc9eec0910 parent 2b25742556b1a351ce4821f6feddcba23bdd930b author Andrew Morton Sun, 13 Aug 2006 23:24:26 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] workqueue: remove lock_cpu_hotplug() Use a private lock instead. It protects all per-cpu data structures in workqueue.c, including the workqueues list. Fix a bug in schedule_on_each_cpu(): it was forgetting to lock down the per-cpu resources. Unfixed long-standing bug: if someone unplugs the CPU identified by `singlethread_cpu' the kernel will get very sick. Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2b25742556b1a351ce4821f6feddcba23bdd930b tree f3edf7f05895f61c6ef366caa8af1a83b6f76905 parent e579dcbf23604cb33c08b5c3c3ac06ca36e7c683 author Michal Januszewski Sun, 13 Aug 2006 23:24:26 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] fbdev: include backlight.h only when __KERNEL__ is defined linux/backlight.h pulls in header files (eg. ioport.h) that break compilation of userspace programs. To solve the problem, only include backlight.h in fb.h if compiling kernel stuff. Signed-off-by: Michal Januszewski Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e579dcbf23604cb33c08b5c3c3ac06ca36e7c683 tree 293581684fc47260a4610e4a77510b459346e2aa parent 6997a6faaa129a1c91775f7344c8d371a05178ea author john stultz Sun, 13 Aug 2006 23:24:24 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] futex_handle_fault always fails We found this issue last week w/ the -RT kernel, but it seems the same issue is in mainline as well. Basically it is possible for futex_unlock_pi to return without actually freeing the lock. This is due to buggy logic in the use of futex_handle_fault() and its attempt argument in a failure case. Looking at futex.c the logic is as follows: 1) In futex_unlock_pi() we start w/ ret=0 and we go down to the first futex_atomic_cmpxchg_inatomic(), where we find uval==-EFAULT. We then jump to the pi_faulted label. 2) From pi_faulted: We increment attempt, unlock the sem and hit the retry label. 3) From the retry label, with ret still zero, we again hit EFAULT on the first futex_atomic_cmpxchg_inatomic(), and again goto the pi_faulted label. 4) Again from pi_faulted: we increment attempt and enter the conditional, where we call futex_handle_fault. 5) futex_handle_fault fails, and we goto the out_unlock_release_sem label. 6) From out_unlock_release_sem we return, and since ret is still zero, we return without error, while never actually unlocking the lock. Issue #1: at the first futex_atomic_cmpxchg_inatomic() we should probably be setting ret=-EFAULT before jumping to pi_faulted: However in our case this doesn't really affect anything, as the glibc we're using ignores the error value from futex_unlock_pi(). Issue #2: Look at futex_handle_fault(), its first conditional will return -EFAULT if attempt is >= 2. However, from the "if(attempt++) futex_handle_fault(attempt)" logic above, we'll *never* call futex_handle_fault when attempt is less then two. So we never get a chance to even try to fault the page in. The following patch addresses these two issues by 1) Always setting ret to -EFAULT if futex_handle_fault fails, and 2) Removing the = in futex_handle_fault's (attempt >= 2) check. I'm really not sure this is the right fix, but wanted to bring it up so folks knew the issue is alive and well in the current -git tree. From looking at the git logs the logic was first introduced (then later copied to other places) in the following commit almost a year ago: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=4732efbeb997189d9f9b04708dc26bf8613ed721;hp=5b039e681b8c5f30aac9cc04385cc94be45d0823 Cc: Rusty Russell Cc: Ingo Molnar Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6997a6faaa129a1c91775f7344c8d371a05178ea tree d1dbf57afc7d561620ad1b192ae031fd234b085a parent 012c437d03cb299814e58ac8d574f7510f5989a5 author Kirill Korotaev Sun, 13 Aug 2006 23:24:23 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] sys_getppid oopses on debug kernel sys_getppid() optimization can access a freed memory. On kernels with DEBUG_SLAB turned ON, this results in Oops. As Dave Hansen noted, this optimization is also unsafe for memory hotplug. So this patch always takes the lock to be safe. [oleg@tv-sign.ru: simplifications] Signed-off-by: Kirill Korotaev Cc: Cc: Dave Hansen Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 012c437d03cb299814e58ac8d574f7510f5989a5 tree 2e7eb5c22549c80b797dd4e99bc4c2c55e64f254 parent 485311a23c72c87332f9a55ce25e650e40ae3fc7 author Horms Sun, 13 Aug 2006 23:24:22 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] Change panic_on_oops message to "Fatal exception" Previously the message was "Fatal exception: panic_on_oops", as introduced in a recent patch whith removed a somewhat dangerous call to ssleep() in the panic_on_oops path. However, Paul Mackerras suggested that this was somewhat confusing, leadind people to believe that it was panic_on_oops that was the root cause of the fatal exception. On his suggestion, this patch changes the message to simply "Fatal exception". A suitable oops message should already have been displayed. Signed-off-by: Simon Horman Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 485311a23c72c87332f9a55ce25e650e40ae3fc7 tree 5c70793c578d4c4f70b7cebef68bc71febb1c1f8 parent 657b3010d8f8a72195dfcbe63040127d596f0b14 author Michal Miroslaw Sun, 13 Aug 2006 23:24:20 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:29 -0700 [PATCH] dm: BUG/OOPS fix Fix BUG I tripped on while testing failover and multipathing. BUG shows up on error path in multipath_ctr() when parse_priority_group() fails after returning at least once without error. The fix is to initialize m->ti early - just after alloc()ing it. BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000 printing eip: c027c3d2 *pde = 00000000 Oops: 0000 [#3] Modules linked in: qla2xxx ext3 jbd mbcache sg ide_cd cdrom floppy CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00010202 (2.6.17.3 #1) EIP is at dm_put_device+0xf/0x3b eax: 00000001 ebx: ee4fcac0 ecx: 00000000 edx: ee4fcac0 esi: ee4fc4e0 edi: ee4fc4e0 ebp: 00000000 esp: c5db3e78 ds: 007b es: 007b ss: 0068 Process multipathd (pid: 15912, threadinfo=c5db2000 task=ef485a90) Stack: ec4eda40 c02816bd ee4fc4c0 00000000 f7e89498 f883e0bc c02816f6 f7e89480 f7e8948c c0281801 ffffffea f7e89480 f883e080 c0281ffe 00000001 00000000 00000004 dfe9cab8 f7a693c0 f883e080 f883e0c0 ca4b99c0 c027c6ee 01400000 Call Trace: free_pgpaths+0x31/0x45 free_priority_group+0x25/0x2e free_multipath+0x35/0x67 multipath_ctr+0x123/0x12d dm_table_add_target+0x11e/0x18b populate_table+0x8a/0xaf table_load+0x52/0xf9 ctl_ioctl+0xca/0xfc table_load+0x0/0xf9 do_ioctl+0x3e/0x43 vfs_ioctl+0x16c/0x178 sys_ioctl+0x48/0x60 syscall_call+0x7/0xb Code: 97 f0 00 00 00 89 c1 83 c9 01 80 e2 01 0f 44 c1 88 43 14 8b 04 24 59 5b 5e 5f 5d c3 53 89 c1 89 d3 ff 4a 08 0f 94 c0 84 c0 74 2a <8b> 01 8b 10 89 d8 e8 f6 fb ff ff 8b 03 8b 53 04 89 50 04 89 02 EIP: [] dm_put_device+0xf/0x3b SS:ESP 0068:c5db3e78 Signed-off-by: Michal Miroslaw Acked-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 657b3010d8f8a72195dfcbe63040127d596f0b14 tree e3cd79a634949a01955be6e53f84b78b4f1b0d66 parent 3773dc92055f219c2f2403f9de774b8ad41a9214 author Andrew Morton Sun, 13 Aug 2006 23:24:19 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] panic.c build fix kernel/panic.c: In function 'add_taint': kernel/panic.c:176: warning: implicit declaration of function 'debug_locks_off' Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3773dc92055f219c2f2403f9de774b8ad41a9214 tree 621406999c6bafdf635a8425be2e67ba8e894e22 parent 95f8797f42b058333d1e6f0d1dcd8edf5dc6c244 author Jan Blunck Sun, 13 Aug 2006 23:24:19 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] fix hrtimer percpu usage typo The percpu variable is used incorrectly in switch_hrtimer_base(). Signed-off-by: Jan Blunck Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 95f8797f42b058333d1e6f0d1dcd8edf5dc6c244 tree f0f0cc374b0d0d884210f3cdbd0774efe3b79fe9 parent 1725cd0ae07bb31f68803edcc5bdc99952c7d2f4 author Dan Bastone Sun, 13 Aug 2006 23:24:18 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] initialize parts of udf inode earlier in create Eric says: > I saw an oops down this path when trying to create a new file on a UDF > filesystem which was internally marked as readonly, but mounted rw: > > udf_create > udf_new_inode > new_inode > alloc_inode > udf_alloc_inode > udf_new_block > returns EIO due to readonlyness > iput (on error) I ran into the same issue today, but when listing a directory with invalid/corrupt entries: udf_lookup udf_iget get_new_inode_fast alloc_inode udf_alloc_inode __udf_read_inode fails for any reason iput (on error) ... The following patch to udf_alloc_inode() should take care of both (and other similar) cases, but I've only tested it with udf_lookup(). Signed-off-by: Dan Bastone Cc: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1725cd0ae07bb31f68803edcc5bdc99952c7d2f4 tree ef5ab0a139e3458df0c2c4bbeb5ff977a6dfd31f parent b64ef8afa58f397e1eaba2bd9ecaa6812064d464 author Andrew Morton Sun, 13 Aug 2006 23:24:17 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] adfs error message fix Don't use NULL as a printf control string. Fixes bug #6889. Cc: Ralph Corderoy Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b64ef8afa58f397e1eaba2bd9ecaa6812064d464 tree 2e8a312cbf4ff9df84ecee3ea2eca5c0c349d9a2 parent e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 author Edgar Hucek Sun, 13 Aug 2006 23:24:16 -0700 committer Greg Kroah-Hartman Mon, 14 Aug 2006 12:54:28 -0700 [PATCH] add imacfb documentation and detection Add basic Machine detection to imacfb and some Ducumentation bits for imacfb. Signed-off-by: Edgar Hucek Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 tree 7313e7994ed8dbeb47ca454ee7c53d45e040738d parent dcb7cd97f133f7cfbd181149a1e60215a869f895 author Herbert Xu Sun, 13 Aug 2006 20:12:58 -0700 committer David S. Miller Sun, 13 Aug 2006 20:12:58 -0700 [INET]: Use pskb_trim_unique when trimming paged unique skbs The IPv4/IPv6 datagram output path was using skb_trim to trim paged packets because they know that the packet has not been cloned yet (since the packet hasn't been given to anything else in the system). This broke because skb_trim no longer allows paged packets to be trimmed. Paged packets must be given to one of the pskb_trim functions instead. This patch adds a new pskb_trim_unique function to cover the IPv4/IPv6 datagram output path scenario and replaces the corresponding skb_trim calls with it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit dcb7cd97f133f7cfbd181149a1e60215a869f895 tree 73e600aa19051981a566ad55ca5fa6f9acec4f7a parent 0eff66e625306a794ecba4b29ed12f7a147ce219 author Mark Huang Sun, 13 Aug 2006 18:57:54 -0700 committer David S. Miller Sun, 13 Aug 2006 18:57:54 -0700 [NETFILTER]: ulog: fix panic on SMP kernels Fix kernel panic on various SMP machines. The culprit is a null ub->skb in ulog_send(). If ulog_timer() has already been scheduled on one CPU and is spinning on the lock, and ipt_ulog_packet() flushes the queue on another CPU by calling ulog_send() right before it exits, there will be no skbuff when ulog_timer() acquires the lock and calls ulog_send(). Cancelling the timer in ulog_send() doesn't help because it has already been scheduled and is running on the first CPU. Similar problem exists in ebt_ulog.c and nfnetlink_log.c. Signed-off-by: Mark Huang Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0eff66e625306a794ecba4b29ed12f7a147ce219 tree 2f6cfe4d4c6305ccf1c0e942865e8753959a27a4 parent 7ee66fcb94cb8be77d5f34cce7d315d11759f9c1 author Patrick McHardy Sun, 13 Aug 2006 18:57:28 -0700 committer David S. Miller Sun, 13 Aug 2006 18:57:28 -0700 [NETFILTER]: {arp,ip,ip6}_tables: proper error recovery in init path Neither of {arp,ip,ip6}_tables cleans up behind itself when something goes wrong during initialization. Noticed by Rennie deGraaf Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7ee66fcb94cb8be77d5f34cce7d315d11759f9c1 tree b42e1a84e1f75d85ad12cfc2b90dbf8a4c6a7447 parent d49c73c729e2ef644558a1f441c044bfacdc9744 author Stephen Hemminger Sun, 13 Aug 2006 18:56:26 -0700 committer David S. Miller Sun, 13 Aug 2006 18:56:26 -0700 [LLC]: multicast receive device match Fix from Aji_Srinivas@emc.com, STP packets are incorrectly received on all LLC datagram sockets, whichever interface they are bound to. The llc_sap datagram receive logic sends packets with a unicast destination MAC to one socket bound to that SAP and MAC, and multicast packets to all sockets bound to that SAP. STP packets are multicast, and we do need to know on which interface they were received. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d49c73c729e2ef644558a1f441c044bfacdc9744 tree db35cd20d57fe5d9a7fcac5f40539902b6abbdf9 parent 1c7628bd7a458faf7c96ef521f6d3a5ea9b106b8 author David S. Miller Sun, 13 Aug 2006 18:55:53 -0700 committer David S. Miller Sun, 13 Aug 2006 18:55:53 -0700 [IPSEC]: Validate properly in xfrm_dst_check() If dst->obsolete is -1, this is a signal from the bundle creator that we want the XFRM dst and the dsts that it references to be validated on every use. I misunderstood this intention when I changed xfrm_dst_check() to always return NULL. Now, when we purge a dst entry, by running dst_free() on it. This will set the dst->obsolete to a positive integer, and we want to return NULL in that case so that the socket does a relookup for the route. Thus, if dst->obsolete<0, let stale_bundle() validate the state, else always return NULL. In general, we need to do things more intelligently here because we flush too much state during rule changes. Herbert Xu has some ideas wherein the key manager gives us some help in this area. We can also use smarter state management algorithms inside of the kernel as well. Signed-off-by: David S. Miller commit 1c7628bd7a458faf7c96ef521f6d3a5ea9b106b8 tree 45c4a21ee032a813df08dd4e4dc47b0a14fa571d parent 97c802a113989800430a981b6f36b14c62163d37 author Patrick McHardy Sun, 13 Aug 2006 18:06:02 -0700 committer David S. Miller Sun, 13 Aug 2006 18:06:02 -0700 [NETFILTER]: xt_hashlimit: fix limit off-by-one Hashlimit doesn't account for the first packet, which is inconsistent with the limit match. Reported by ryan.castellucci@gmail.com, netfilter bugzilla #500. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 97c802a113989800430a981b6f36b14c62163d37 tree 92dad3b2bb31469531c6a6f2c8bc2a3bba2f861a parent 18b6fe64d4d1f6e0a2c71429a5e5074f43e29203 author Phil Oester Sun, 13 Aug 2006 18:05:35 -0700 committer David S. Miller Sun, 13 Aug 2006 18:05:35 -0700 [NETFILTER]: xt_string: fix negation The xt_string match is broken with ! negation. This resolves a portion of netfilter bugzilla #497. Signed-off-by: Phil Oester Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 18b6fe64d4d1f6e0a2c71429a5e5074f43e29203 tree 32d7c7f7a3fc82c5478f129f52105c1c020df75a parent f54fa84dda211f68f65002efa44142207c886c79 author David S. Miller Sun, 13 Aug 2006 18:05:09 -0700 committer David S. Miller Sun, 13 Aug 2006 18:05:09 -0700 [TCP]: Fix botched memory leak fix to tcpprobe_read(). Somehow I clobbered James's original fix and only my subsequent compiler warning change went in for that changeset. Get the real fix in there. Noticed by Jesper Juhl. Signed-off-by: David S. Miller commit f54fa84dda211f68f65002efa44142207c886c79 tree 117113e866346afa5737a78ba3ba2085b059aab1 parent 2011e9249a252e0655807fbe6841f6cfe6b6c197 author Orjan Friberg Tue, 08 Aug 2006 23:31:40 -0700 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: usbtest.c: unsigned retval makes ctrl_out return 0 in case of error In my quest to try and figure out why test 14 (control write) doesn't work with my EZ-USB board, I noticed that sometimes testusb reported no error even though the kernel log complained "byte 0 is 0 not 2" etc. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2011e9249a252e0655807fbe6841f6cfe6b6c197 tree c9395f80099187cd9dc710874591e4e438558185 parent 922fdaa692e23bf57a10c16047d993c181991579 author Jonathan Davies Wed, 09 Aug 2006 10:48:03 +0100 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: ftdi_sio driver - new PIDs Signed-off-by: Jonathan Davies Signed-off-by: Greg Kroah-Hartman commit 922fdaa692e23bf57a10c16047d993c181991579 tree 6381403081e18fefa11a007b619caf245b5410e9 parent 7af569abc33ce09d3cb93e9b2160efff2531c59f author Norihiko Tomiyama Tue, 08 Aug 2006 14:31:25 +0900 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: Additional PID for SHARP W-ZERO3 I write a patch for ipaq.c. Would you like to add upstream tree ? This patch enables a support of "SHARP W-ZERO3(WS004SH)" and "SHARP W-ZERO3[es](WS007SH)". From: Norihiko Tomiyama Signed-off-by: Greg Kroah-Hartman commit 7af569abc33ce09d3cb93e9b2160efff2531c59f tree b8d4dd5cf7c9e01049f3cf3483f5b8c8b7c91bf0 parent 919aeadcfa8e72ec2d6bf7bd405a16c40b8d8ecf author Johannes Berg Wed, 19 Jul 2006 15:39:46 +0200 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: appletouch: fix atp_disconnect appletouch uses urb->transfer_dma after having freed the urb, this shows up only if the system is compiled with slab debugging. This patch fixes it by reordering the free calls. Signed-off-by: Johannes Berg Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit 919aeadcfa8e72ec2d6bf7bd405a16c40b8d8ecf tree 11552bd24b2a689cf02ce581024998fc4f44a8af parent b41ee5d62211825cbe5e583cafc2255c91385aee author Yoichi Yuasa Thu, 03 Aug 2006 09:54:24 +0900 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:06 -0700 USB: removed a unbalanced #endif from ohci-au1xxx.c This patch has removed a unbalanced #endif from ohci-au1xxx.c . Please apply before 2.6.18 release. Error message was: In file included from drivers/usb/host/ohci-hcd.c:909: drivers/usb/host/ohci-au1xxx.c:113:2: #endif without #if Signed-off-by: Yoichi Yuasa Signed-off-by: Greg Kroah-Hartman commit b41ee5d62211825cbe5e583cafc2255c91385aee tree 7bd8ceb0069a844c0e84ab112b85785015ee9f12 parent f0c1dc07309f0fe3409b92eb170b648a487b1e81 author David Kuehling Mon, 07 Aug 2006 10:18:48 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 USB: unusual_devs entry for A-VOX WSX-300ER MP3 player This patch (as763) adds an unusual_devs entry for the A-VOX WSX-300ER MP3 player. From: David Kuehling Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f0c1dc07309f0fe3409b92eb170b648a487b1e81 tree bffa6977410d22edbc0dab8fe7be052865a1b9e4 parent e50d1088bf2e5a68068c5f602be1dcc3e52dc873 author Dave Jones Wed, 09 Aug 2006 15:25:09 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 PCI: remove dead HOTPLUG_PCI_SHPC_PHPRM_LEGACY option. Nothing in the tree references this config option. Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit e50d1088bf2e5a68068c5f602be1dcc3e52dc873 tree 72e502cb1f59081f07ea40344e23a46cb341d3b2 parent 1cc6daf2349ea07830906e05164256ab36d82697 author Kristen Carlson Accardi Tue, 08 Aug 2006 09:44:26 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 pciehp: make pciehp build for powerpc Make pciehp build on powerpc Signed-off-by: Kristen Carlson Accardi Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 1cc6daf2349ea07830906e05164256ab36d82697 tree 5385595a7b3cfdd92d70ed3bb3321ff6afdf072e parent e9539ee73a9b85bdc6eab9e15dd1ee639a815406 author Pavel Machek Tue, 08 Aug 2006 01:37:15 +0200 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 pr_debug() should not be used in drivers pr_debug() should not be used from drivers, add comment saying that. Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit e9539ee73a9b85bdc6eab9e15dd1ee639a815406 tree 3a3f2242c8e9d3f2f0b324dfe0fa324d3b1e9ee2 parent 4ca8a3c1b17cde8241eb9157484519427fa5bf91 author Brandon Philips Tue, 01 Aug 2006 14:04:17 -0500 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 genhd.c reference in Documentation/kobjects.txt block/genhd.c no longer in drivers/. Update Documentation/kobjects.txt Signed-off-by: Brandon Philips Signed-off-by: Greg Kroah-Hartman commit 4ca8a3c1b17cde8241eb9157484519427fa5bf91 tree e68a5b1148ae8a90751ff16bddac826b73a2e817 parent c4e321b85a89d7cd392d3105b2c033a6c58ed337 author Steven Rostedt Thu, 03 Aug 2006 12:28:11 -0400 committer Greg Kroah-Hartman Fri, 11 Aug 2006 14:06:05 -0700 Add stable branch to maintainers file While helping someone to submit a patch to the stable branch, I noticed that the stable branch is not listed in the MAINTAINERS file. This was after I went there to look for the email addresses for the stable branch list (stable@kernel.org). This patch adds the stable branch to the maintainers file so that people can find where to send patches when they have a fix for the stable team. Signed-off-by: Steven Rostedt Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman commit c4e321b85a89d7cd392d3105b2c033a6c58ed337 tree 9990b519bc24579e9497f1b15ca94f2fc9cd61d3 parent f8872f4cb4b58f06a27d0443668d12d49f3b5d31 parent dd2c609c59cd9daeb90d58f3d1bc3813e8987df1 author Greg Kroah-Hartman Thu, 10 Aug 2006 15:10:01 -0700 committer Greg Kroah-Hartman Thu, 10 Aug 2006 15:10:01 -0700 Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-mmc commit f8872f4cb4b58f06a27d0443668d12d49f3b5d31 tree cf6bd1786e902f99ab764f8d8482f557cd8cf531 parent 99baa75231e35aca41b9718adfb07f45ce40e84c parent 574dc0abab6650c5371df15ac708e48fa25bed89 author Greg Kroah-Hartman Thu, 10 Aug 2006 15:07:17 -0700 committer Greg Kroah-Hartman Thu, 10 Aug 2006 15:07:17 -0700 Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm commit d0710c7c9eea2145a0614f39dbe9dc8cb4ae14da tree 6d89207033a0a4a9e0c02b507a7f4745d40d4a9d parent ebc4599990898ecaaace7ed40dfad6d8d9f2a24a author Horst Hummel Thu, 10 Aug 2006 15:45:16 +0200 committer Martin Schwidefsky Thu, 10 Aug 2006 15:45:16 +0200 [S390] dasd calls kzalloc while holding a spinlock. The dasd function dasd_set_uid calls kzalloc while holding the dasd_devmap_lock. Rearrange the code to do the memory allocation outside the lock. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 99baa75231e35aca41b9718adfb07f45ce40e84c tree 43af56a0ebfab13169eff61ffa3bfb13c5fb1bd0 parent fff642570dc47ab76491fe81ee6599269c4eb13e parent 0e1edbd99994270023cea5afe593f972eb09a778 author Greg Kroah-Hartman Wed, 09 Aug 2006 23:57:52 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 23:57:52 -0700 Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6 commit 0e1edbd99994270023cea5afe593f972eb09a778 tree e4b2618172c17426d200ec435c24daaf606e2437 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Nathan Scott Thu, 10 Aug 2006 14:40:41 +1000 committer Nathan Scott Thu, 10 Aug 2006 14:40:41 +1000 [XFS] Fix xfs_free_extent related NULL pointer dereference. We recently fixed an out-of-space deadlock in XFS, and part of that fix involved the addition of the XFS_ALLOC_FLAG_FREEING flag to some of the space allocator calls to indicate they're freeing space, not allocating it. There was a missed xfs_alloc_fix_freelist condition test that did not correctly test "flags". The same test would also test an uninitialised structure field (args->userdata) and depending on its value either would or would not return early with a critical buffer pointer set to NULL. This fixes that up, adds asserts to several places to catch future botches of this nature, and skips sections of xfs_alloc_fix_freelist that are irrelevent for the space-freeing case. SGI-PV: 955303 SGI-Modid: xfs-linux-melb:xfs-kern:26743a Signed-off-by: Nathan Scott commit fff642570dc47ab76491fe81ee6599269c4eb13e tree f5620d5af28bcd5614386a43febc5751423abf05 parent 06aebfb7faa13258af5230ff3d1587ece6c0250e author David S. Miller Wed, 09 Aug 2006 17:36:15 -0700 committer David S. Miller Wed, 09 Aug 2006 17:36:15 -0700 [IPX]: Fix typo, ipxhdr() --> ipx_hdr() Noticed by Dave Jones. Signed-off-by: David S. Miller commit 06aebfb7faa13258af5230ff3d1587ece6c0250e tree 8d2703662be840f8e64084d42706b1e4e5a354c9 parent 79860a9a79a17f1bed0713680a3995467405ba49 author Herbert Xu Wed, 09 Aug 2006 16:52:04 -0700 committer David S. Miller Wed, 09 Aug 2006 16:52:04 -0700 [IPV6]: The ifa lock is a BH lock The ifa lock is expected to be taken in BH context (by addrconf timers) so we must disable BH when accessing it from user context. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 79860a9a79a17f1bed0713680a3995467405ba49 tree bf127cfc807aef0ef4f5bdc53b43a6f1f32d3fd1 parent a4657141091c2f975fa35ac1ad28fffdd756091e author Alan Cox Wed, 09 Aug 2006 15:04:58 +0100 committer Greg Kroah-Hartman Wed, 09 Aug 2006 15:43:27 -0700 [PATCH] PATCH: 2.6.18 oops on boot fix for IDE When the IDE fix for Jmicron went in one piece went walking somewhere (send log shows my end somehow). Without this sometimes you get an oops on boot. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit a4657141091c2f975fa35ac1ad28fffdd756091e tree d284f416d2ffb21d5cb3a74843a9ab976ec32193 parent 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e parent 7c91767a6b701543c93ebcd611dab61deff3dad1 author Greg Kroah-Hartman Wed, 09 Aug 2006 11:49:13 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 11:49:13 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 54f58d6c4f15f3bdf15d43fa640ca6de9487f50e tree 5d6bab099bb8376528847ec37f162d218c7940b9 parent 897e11a40baf24224bd0edc948f908ed07c5675d parent 013b68bf7cb4edfb8753aac9bde3cb60c84bc067 author Greg Kroah-Hartman Wed, 09 Aug 2006 11:46:30 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 11:46:30 -0700 Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 897e11a40baf24224bd0edc948f908ed07c5675d tree a256194bc50f9f0eeef68d7cba746ae4d35629b4 parent ad552692a4489917fa4b71f9c6a91baae4aee799 parent 22aac0896b1b0b8cabaf00714c55dd12f25d5738 author Greg Kroah-Hartman Wed, 09 Aug 2006 11:45:59 -0700 committer Greg Kroah-Hartman Wed, 09 Aug 2006 11:45:59 -0700 Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 7c91767a6b701543c93ebcd611dab61deff3dad1 tree 5ccc47d32641d1dacff118bb6b4f7256acb8e2dc parent 7b1ba8de569460894efa892457af7a37c0d574f9 author Dmitry Mishin Wed, 09 Aug 2006 02:25:54 -0700 committer David S. Miller Wed, 09 Aug 2006 02:25:54 -0700 [NET]: add_timer -> mod_timer() in dst_run_gc() Patch from Dmitry Mishin : Replace add_timer() by mod_timer() in dst_run_gc in order to avoid BUG message. CPU1 CPU2 dst_run_gc() entered dst_run_gc() entered spin_lock(&dst_lock) ..... del_timer(&dst_gc_timer) fail to get lock .... mod_timer() <--- puts timer back to the list add_timer(&dst_gc_timer) <--- BUG because timer is in list already. Found during OpenVZ internal testing. At first we thought that it is OpenVZ specific as we added dst_run_gc(0) call in dst_dev_event(), but as Alexey pointed to me it is possible to trigger this condition in mainstream kernel. F.e. timer has fired on CPU2, but the handler was preeempted by an irq before dst_lock is tried. Meanwhile, someone on CPU1 adds an entry to gc list and starts the timer. If CPU2 was preempted long enough, this timer can expire simultaneously with resuming timer handler on CPU1, arriving exactly to the situation described. Signed-off-by: Dmitry Mishin Signed-off-by: Kirill Korotaev Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit ebc4599990898ecaaace7ed40dfad6d8d9f2a24a tree d372ff43bf40c11576671a7a35185b034d3a5a4d parent 5cb900a34f640771a4ab6a178659c75022f2971a author Horst Hummel Wed, 09 Aug 2006 10:30:22 +0200 committer Martin Schwidefsky Wed, 09 Aug 2006 10:30:22 +0200 [S390] dasd set offline kernel bug. The request queue flush function of the dasd driver has to dequeue the requests first and then call the end request function. Otherwise a kernel bug in ll_rw_block.c might get triggered. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 22aac0896b1b0b8cabaf00714c55dd12f25d5738 tree fbae079c8ca9b22103a1e11439ae8b738d756c72 parent 85455dd34219376dcc7dce94bea67058f0b7d731 author Tejun Heo Tue, 08 Aug 2006 14:08:59 +0900 committer Jeff Garzik Wed, 09 Aug 2006 01:16:27 -0400 [PATCH] libata: clear sdev->locked on door lock failure SCSI EH locks door if sdev->locked is set. Sometimes door lock command fails continuously (e.g. when medium is not present) and as libata uses EH to acquire sense data, this easily creates a loop where a failed lock door invokes EH and EH issues lock door on completion. This patch clears sdev->locked on door lock failure to break this loop. This problem has been spotted and diagnosed by Unicorn Chang . Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 85455dd34219376dcc7dce94bea67058f0b7d731 tree dc81f6f2fa31fef75fec99096c52c6213302ade2 parent c71d6be54e92c4b2d31faf51850354aff22b82b0 author Keith Owens Tue, 08 Aug 2006 13:51:02 +1000 committer Jeff Garzik Wed, 09 Aug 2006 01:16:27 -0400 [PATCH] Fix compile problem when sata debugging is on Fix a sata debug print statement that still uses an old variable name. Signed-off-by: Keith Owens Signed-off-by: Jeff Garzik commit 013b68bf7cb4edfb8753aac9bde3cb60c84bc067 tree 7ce7d4a4c5e519b4a8f60ec6eff0d673bfa74fb9 parent 2f96740c26f1dcff9111dca3e01379ab12aafde5 author Brice Goglin Wed, 09 Aug 2006 00:07:53 -0400 committer Jeff Garzik Wed, 09 Aug 2006 00:12:47 -0400 [PATCH] myri10ge: always re-enable dummy rdmas in myri10ge_resume Dummy RDMA are always enabled on device startup since commit 9a71db721a2cbb9921b929b2699ab181f5a3c6c0 (to work around buggy PCIe chipsets which do not implement resending properly). But, we also need to always re-enable them when resuming the device. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit c71d6be54e92c4b2d31faf51850354aff22b82b0 tree ab0f157c958658aa57e17fffce5d67f6e80c3b1b parent 9f737633e6ee54fc174282d49b2559bd2208391d parent 77f3f879387cc5fce6c7a4ca7777c586fe6291cd author Jeff Garzik Tue, 08 Aug 2006 23:59:39 -0400 committer Jeff Garzik Tue, 08 Aug 2006 23:59:39 -0400 Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into upstream-fixes commit 2f96740c26f1dcff9111dca3e01379ab12aafde5 tree fd40f2f794431089c18659ecfaa054cad5dca22e parent 9f737633e6ee54fc174282d49b2559bd2208391d parent 782a6675119c76c071e74e2ddd98268f47770cba author Jeff Garzik Tue, 08 Aug 2006 23:48:48 -0400 committer Jeff Garzik Tue, 08 Aug 2006 23:48:48 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 7b1ba8de569460894efa892457af7a37c0d574f9 tree 8739f17110b12aedf5f3067c3dba1f3350727f7a parent 70f8e78e150425b01c1099087ad3decacf7e4ccf author Stephen Hemminger Tue, 08 Aug 2006 16:48:51 -0700 committer David S. Miller Tue, 08 Aug 2006 16:48:51 -0700 [IPX]: Another nonlinear receive fix Need to check some more cases in IPX receive. If the skb is purely fragments, the IPX header needs to be extracted. The function pskb_may_pull() may in theory invalidate all the pointers in the skb, so references to ipx header must be refreshed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 70f8e78e150425b01c1099087ad3decacf7e4ccf tree a8b670e567d0936b830d2212101e5593b4f1c57c parent 1b2a720506ccf7c30baaeda5d990c29b31e21726 author David S. Miller Tue, 08 Aug 2006 16:47:37 -0700 committer David S. Miller Tue, 08 Aug 2006 16:47:37 -0700 [RTNETLINK]: Fix IFLA_ADDRESS handling. The ->set_mac_address handlers expect a pointer to a sockaddr which contains the MAC address, whereas IFLA_ADDRESS provides just the MAC address itself. So whip up a sockaddr to wrap around the netlink attribute for the ->set_mac_address call. Signed-off-by: David S. Miller commit ad552692a4489917fa4b71f9c6a91baae4aee799 tree 26cd1c8a92f9c8f9a219961fe054adbf877e85f4 parent 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 parent 0851fb48486c044476b019029245cb9b348fca33 author Greg Kroah-Hartman Tue, 08 Aug 2006 14:19:23 -0700 committer Greg Kroah-Hartman Tue, 08 Aug 2006 14:19:23 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb commit 0851fb48486c044476b019029245cb9b348fca33 tree 4a664e168f9d809963a52f507e0b5c4f6803e881 parent eafa98177a388700d613c187c7716e11869b7171 author Yeasah Pell Tue, 08 Aug 2006 09:10:18 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4431): Add several error checks to dst Signed-off-by: Yeasah Pell Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit eafa98177a388700d613c187c7716e11869b7171 tree b8f8fc1903e72a3695b5435b74c5cb24dfaf9ac0 parent 8a016dcc8383bedc731bca9fdedae77ff52a6ad7 author Diego Calleja Tue, 08 Aug 2006 09:10:17 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4430): Quickcam_messenger compilation fix In bugzilla #6943, Maxim Britov reported: "I can enable Logitech quickcam support in .config, but it want be compile. I have to add into drivers/media/video/Makefile: obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/" He's right, just enable that driver as module while disabling every other driver that gets into that directory, nothing will get compiled. This patch fixes the Makefile. Signed-off-by: Diego Calleja Acked-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8a016dcc8383bedc731bca9fdedae77ff52a6ad7 tree 0accaa04a9d8976f95ca46929ca65f446cc08c53 parent 43c560fa59ef2688d891f6431e972b7763b73a00 author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:16 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4427): Fix V4L1 Compat for VIDIOCGPICT ioctl Signed-off-by: Mauro Carvalho Chehab commit 43c560fa59ef2688d891f6431e972b7763b73a00 tree 6b58b6764d2f9cac26ba3e646fc8c867bbe1e262 parent e335fada5afef0658038b6bec432d37f332da9fc author Hans Verkuil Tue, 08 Aug 2006 09:10:15 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:04 -0300 V4L/DVB (4419): Turn on the Low Noise Amplifier of the Samsung tuners. Without the LNA these tuners perform very poorly (read 'unwatchable') when the signal is weak. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e335fada5afef0658038b6bec432d37f332da9fc tree 93aaf4228723915db153bbf9eaaa7d0c57e2db90 parent 17531c168c7b8138b5379a85de788798fc6696e1 author Hans Verkuil Tue, 08 Aug 2006 09:10:15 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:03 -0300 V4L/DVB (4418): Fix broken msp3400 module option 'standard' Due to a wrong statement order the 'standard' module option didn't work for 'G' model chips. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 17531c168c7b8138b5379a85de788798fc6696e1 tree f0ca8541a78786c01c90fefe58a11c9dc8ca5504 parent b02dc515914bc37f5e406cc6f622fc06991eb779 author Hans Verkuil Tue, 08 Aug 2006 09:10:12 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:03 -0300 V4L/DVB (4416): Cx25840_read4 has wrong endianness. cx25840_read4 assembled the bytes in the wrong order. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b02dc515914bc37f5e406cc6f622fc06991eb779 tree 29eaa79b76db0d98de2d057aba43ff14200ccb59 parent 7fb6529762f8185f792ad74adcf211713f973c80 author Trent Piepho Tue, 08 Aug 2006 09:10:12 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:53:03 -0300 V4L/DVB (4411): Fix minor errors in build files In pwc Kconfig, change 'depends' to 'depends on' In dvb-core Makefile, change '=' to ':=' Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 7fb6529762f8185f792ad74adcf211713f973c80 tree c6dd9bb2f151561e795977366669df55faf8eafb parent 0dfa9abd6bd153364da8cb131db0d0404ab15ad1 author Mauro Carvalho Chehab Tue, 08 Aug 2006 15:47:31 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 15:52:52 -0300 V4L/DVB (4407): Driver dsbr100 is a radio device, not a video one! Signed-off-by: Mauro Carvalho Chehab commit 0dfa9abd6bd153364da8cb131db0d0404ab15ad1 tree 5c46dc1a46e43eb08fe0ba7900a88fdd35577e7e parent 3cdc0f263b9fe99f7dfcef49df7a148b458e9d11 author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:10 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:07 -0300 V4L/DVB (4399): Fix a typo that caused some compat stuff to not work Config option typo: -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT Signed-off-by: Mauro Carvalho Chehab commit 3cdc0f263b9fe99f7dfcef49df7a148b458e9d11 tree a859c93a8dd066db9548c0cc9e4d02f7853f37cd parent 6054b68e84478e66e626bde33f93b5f0bf48c180 author Luc Van Oostenryck Tue, 08 Aug 2006 09:10:10 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:05 -0300 V4L/DVB (4395): Restore compat_ioctl in pwc driver The compat_ioctl support of the pwc driver was dropped during the last update of the driver. I suppose it was by mistake. If yes here is the patch to restore the support. Signed-off-by: Luc Van Oostenryck Signed-off-by: Mauro Carvalho Chehab commit 6054b68e84478e66e626bde33f93b5f0bf48c180 tree f483ed2777058c7c5ae6cc447bdd19d5309b4ca0 parent 5bdd6cc3300be534f2a2cf826e3fb926b5695698 author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:06 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:03 -0300 V4L/DVB (4371b): Fix V4L1 dependencies at drivers under sound/oss and sound/pci TVMixer and FM801 Tea5757 are still using V4L1 API. Signed-off-by: Mauro Carvalho Chehab commit 5bdd6cc3300be534f2a2cf826e3fb926b5695698 tree 401b0f19ff7930666d0afb3c0701c769b0d498a0 parent 487206f26364a878f5f8cec9f92796d403f1d7c9 author Mauro Carvalho Chehab Tue, 25 Jul 2006 16:17:54 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:55:01 -0300 V4L/DVB (4371a): Fix V4L1 dependencies on compat_ioctl32 Compat32 should be able to handle V4L1 ioctls if the old API support were selected. Signed-off-by: Mauro Carvalho Chehab commit 487206f26364a878f5f8cec9f92796d403f1d7c9 tree 7f5a8271373daf6e0763aa27a9e1f561c281fc99 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Mauro Carvalho Chehab Tue, 08 Aug 2006 09:10:01 -0300 committer Mauro Carvalho Chehab Tue, 08 Aug 2006 13:54:12 -0300 V4L/DVB (4340): Videodev.h should be included also when V4L1_COMPAT is selected. Signed-off-by: Mauro Carvalho Chehab commit 81b73dd92b97423b8f5324a59044da478c04f4c4 tree 032f8415eb980d7f231e8e2490fba3c5356aadf9 parent dcc42f483d6808ba4d04af9da35e7e47b711f6c2 author Haren Myneni Thu, 27 Jul 2006 14:29:00 -0700 committer Paul Mackerras Tue, 08 Aug 2006 16:00:11 +1000 [POWERPC] Fix might-sleep warning on removing cpus Noticing the following might_sleep warning (dump_stack()) during kdump testing when CONFIG_DEBUG_SPINLOCK_SLEEP is enabled. All secondary CPUs will be calling rtas_set_indicator with interrupts disabled to remove them from global interrupt queue. BUG: sleeping function called from invalid context at arch/powerpc/kernel/rtas.c:463 in_atomic():1, irqs_disabled():1 Call Trace: [C00000000FFFB970] [C000000000010234] .show_stack+0x68/0x1b0 (unreliable) [C00000000FFFBA10] [C000000000059354] .__might_sleep+0xd8/0xf4 [C00000000FFFBA90] [C00000000001D1BC] .rtas_busy_delay+0x20/0x5c [C00000000FFFBB20] [C00000000001D8A8] .rtas_set_indicator+0x6c/0xcc [C00000000FFFBBC0] [C000000000048BF4] .xics_teardown_cpu+0x118/0x134 [C00000000FFFBC40] [C00000000004539C] .pseries_kexec_cpu_down_xics+0x74/0x8c [C00000000FFFBCC0] [C00000000002DF08] .crash_ipi_callback+0x15c/0x188 [C00000000FFFBD50] [C0000000000296EC] .smp_message_recv+0x84/0xdc [C00000000FFFBDC0] [C000000000048E08] .xics_ipi_dispatch+0xf0/0x130 [C00000000FFFBE50] [C00000000009EF10] .handle_IRQ_event+0x7c/0xf8 [C00000000FFFBF00] [C0000000000A0A14] .handle_percpu_irq+0x90/0x10c [C00000000FFFBF90] [C00000000002659C] .call_handle_irq+0x1c/0x2c [C00000000058B9C0] [C00000000000CA10] .do_IRQ+0xf4/0x1a4 [C00000000058BA50] [C0000000000044EC] hardware_interrupt_entry+0xc/0x10 --- Exception: 501 at .plpar_hcall_norets+0x14/0x1c LR = .pseries_dedicated_idle_sleep+0x190/0x1d4 [C00000000058BD40] [C00000000058BDE0] 0xc00000000058bde0 (unreliable) [C00000000058BDF0] [C00000000001270C] .cpu_idle+0x10c/0x1e0 [C00000000058BE70] [C000000000009274] .rest_init+0x44/0x5c To fix this issue, rtas_set_indicator_fast() is added so that will not wait for RTAS 'busy' delay and this new function is used for kdump (in xics_teardown_cpu()) and for CPU hotplug ( xics_migrate_irqs_away() and xics_setup_cpu()). Note that the platform architecture spec says that set-indicator on the indicator we're using here is not permitted to return the busy or extended busy status codes. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit dcc42f483d6808ba4d04af9da35e7e47b711f6c2 tree 22db9fe48c6d35bb46cec23225eacc6bbf9aa4ac parent 9f737633e6ee54fc174282d49b2559bd2208391d author Sonny Rao Wed, 02 Aug 2006 00:20:09 -0400 committer Paul Mackerras Tue, 08 Aug 2006 15:55:12 +1000 [POWERPC] fix PMU initialization on pseries lpar We should not be calling power4_enable_pmcs() in pseries_lpar_enable_pmcs(); just doing the hypercall is sufficient. Prior to 2.6.15 we did not call power4_enable_pmcs() for an lpar. power4_enable_pmcs() tries to read the hid0 register which is no longer legal for an lpar in newer Power processors. Signed-off-by: Paul Mackerras commit 1b2a720506ccf7c30baaeda5d990c29b31e21726 tree 5990f56e364077c83563566ed64beae95b855a9f parent bd37a088596ccdb2b2dd3299e25e333bca7a9a34 author Michael Chan Mon, 07 Aug 2006 21:46:02 -0700 committer David S. Miller Mon, 07 Aug 2006 21:46:02 -0700 [TG3]: Fix tx race condition Fix a subtle race condition between tg3_start_xmit() and tg3_tx() discovered by Herbert Xu : CPU0 CPU1 tg3_start_xmit() if (tx_ring_full) { tx_lock tg3_tx() if (!netif_queue_stopped) netif_stop_queue() if (!tx_ring_full) update_tx_ring netif_wake_queue() tx_unlock } Even though tx_ring is updated before the if statement in tg3_tx() in program order, it can be re-ordered by the CPU as shown above. This scenario can cause the tx queue to be stopped forever if tg3_tx() has just freed up the entire tx_ring. The possibility of this happening should be very rare though. The following changes are made: 1. Add memory barrier to fix the above race condition. 2. Eliminate the private tx_lock altogether and rely solely on netif_tx_lock. This eliminates one spinlock in tg3_start_xmit() when the ring is full. 3. Because of 2, use netif_tx_lock in tg3_tx() before calling netif_wake_queue(). 4. Change TX_BUFFS_AVAIL to an inline function with a memory barrier. Herbert and David suggested using the memory barrier instead of volatile. 5. Check for the full wake queue condition before getting netif_tx_lock in tg3_tx(). This reduces the number of unnecessary spinlocks when the tx ring is full in a steady-state condition. 6. Update version to 3.65. Signed-off-by: Michael Chan Acked-by: Herbert Xu Signed-off-by: David S. Miller commit bd37a088596ccdb2b2dd3299e25e333bca7a9a34 tree 733ea30682425011df988e9b49f350ea4af3233e parent 69d8c28c9578ce78b3dc1b9be36926d962282898 author Wei Yongjun Mon, 07 Aug 2006 21:04:15 -0700 committer David S. Miller Mon, 07 Aug 2006 21:04:15 -0700 [TCP]: SNMPv2 tcpOutSegs counter error Do not count retransmitted segments. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 69d8c28c9578ce78b3dc1b9be36926d962282898 tree 99de9e5074b93c3aee6577fb817ebdfdcbf678b8 parent aaf580601ff244df82324fff380ed6740f27ef03 author David S. Miller Mon, 07 Aug 2006 20:52:10 -0700 committer David S. Miller Mon, 07 Aug 2006 20:52:10 -0700 [PKTGEN]: Make sure skb->{nh,h} are initialized in fill_packet_ipv6() too. Mirror the bug fix from fill_packet_ipv4() Signed-off-by: David S. Miller commit aaf580601ff244df82324fff380ed6740f27ef03 tree be59a493781fddb2f0201de3d5e335524bbd1959 parent 8d1502de27c46b365b5c86e17d173083d3d6c9ac author Chen-Li Tien Mon, 07 Aug 2006 20:49:07 -0700 committer David S. Miller Mon, 07 Aug 2006 20:49:07 -0700 [PKTGEN]: Fix oops when used with balance-tlb bonding Signed-off-by: Chen-Li Tien Signed-off-by: David S. Miller commit 8d1502de27c46b365b5c86e17d173083d3d6c9ac tree e2fa9cebe61e08aaf65d0457c48347cc67716609 parent 8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b author Kirill Korotaev Mon, 07 Aug 2006 20:44:22 -0700 committer David S. Miller Mon, 07 Aug 2006 20:44:22 -0700 [IPV4]: Limit rt cache size properly. From: Kirill Korotaev During OpenVZ stress testing we found that UDP traffic with random src can generate too much excessive rt hash growing leading finally to OOM and kernel panics. It was found that for 4GB i686 system (having 1048576 total pages and 225280 normal zone pages) kernel allocates the following route hash: syslog: IP route cache hash table entries: 262144 (order: 8, 1048576 bytes) => ip_rt_max_size = 4194304 entries, i.e. max rt size is 4194304 * 256b = 1Gb of RAM > normal_zone Attached the patch which removes HASH_HIGHMEM flag from alloc_large_system_hash() call. Signed-off-by: David S. Miller commit 8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b tree 35b76d98988aabfc78a57342291b4be63bb04f99 parent d14cc9a342a8004b0ecfe66f1f12120962b61d8c author Stephen Hemminger Mon, 07 Aug 2006 20:09:20 -0700 committer David S. Miller Mon, 07 Aug 2006 20:09:20 -0700 [IPX]: Header length validation needed This patch will linearize and check there is enough data. It handles the pprop case as well as avoiding a whole audit of the routing code. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d14cc9a342a8004b0ecfe66f1f12120962b61d8c tree 2789722fbdd2118b51f09d47373b83103320417e parent 7b2e497a06c0e93719fda88820e057b635e8fae2 author Christoph Hellwig Mon, 07 Aug 2006 16:11:48 -0700 committer David S. Miller Mon, 07 Aug 2006 16:11:48 -0700 [TG3]: skb->dev assignment is done by netdev_alloc_skb All caller of netdev_alloc_skb need to assign skb->dev shortly afterwards. Move it into common code. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 7b2e497a06c0e93719fda88820e057b635e8fae2 tree 5ca55484d813656f56cf7fc86cafd041327c7dae parent 766ea8cce007e699679109df4fa469b870ba4860 author Christoph Hellwig Mon, 07 Aug 2006 16:09:04 -0700 committer David S. Miller Mon, 07 Aug 2006 16:09:04 -0700 [NET]: Assign skb->dev in netdev_alloc_skb Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 766ea8cce007e699679109df4fa469b870ba4860 tree 07b343a0be217f1cc2b1b06c65dc371ac45fadae parent 9f737633e6ee54fc174282d49b2559bd2208391d author Christoph Hellwig Mon, 07 Aug 2006 15:49:53 -0700 committer David S. Miller Mon, 07 Aug 2006 15:49:53 -0700 [NET]: Fix alloc_skb comment typo Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 tree 2700dbf73a0faef3a8678499c502c1bbaad18a07 parent 8b384b81e27222a307576630c89ea26e17b7be6a parent 9ee4e3365dd0dab4c1e02fe44dc08a223b826c72 author Greg Kroah-Hartman Mon, 07 Aug 2006 13:39:55 -0700 committer Greg Kroah-Hartman Mon, 07 Aug 2006 13:39:55 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 commit 9ee4e3365dd0dab4c1e02fe44dc08a223b826c72 tree f133dfb7e53d0d3ea6f7734c4087dc02f737c5a3 parent 58a2f7d85aaf4c41157f15c43a913b5c3c6b3adb author Sam Ravnborg Mon, 07 Aug 2006 21:01:36 +0200 committer Sam Ravnborg Mon, 07 Aug 2006 21:01:36 +0200 kbuild: external modules shall not check config consistency external modules needs include/linux/autoconf.h and include/config/auto.conf but skip the integrity test of these. Even with a newer Kconfig file we shall just proceed since external modules simply uses the kernel source and shall not attempt to modify it. Error out if a config fiel is missing since they are mandatory. Signed-off-by: Sam Ravnborg commit 58a2f7d85aaf4c41157f15c43a913b5c3c6b3adb tree 1e7b373066c747e25086e8ce3a8789e02538dea2 parent 8ccf28324c14096bef005c90a2bf5e03ffa07cc6 author Sam Ravnborg Mon, 07 Aug 2006 20:58:28 +0200 committer Sam Ravnborg Mon, 07 Aug 2006 20:58:28 +0200 kbuild: do not try to build content of initramfs When a file supplied via CONFIG_INITRAMFS pointed to a file for which kbuild had a rule to compile it (foo.c => foo.o) then kbuild would compile the file before adding the file to the initramfs. Teach make that files included in initramfs shall not be updated by adding an 'empty command'. (See "Using Empty Commands" in info make). Signed-off-by: Sam Ravnborg commit 883d4cae4a2b01a05193cf2665c77b7489a8b6a0 tree 1d4f06fa7bdadf025159ff5408f14080552a0cb0 parent 7bf72edee614e10b8d470c40a326f47bfdd69992 author Mark Fasheh Mon, 05 Jun 2006 16:41:00 -0400 committer Mark Fasheh Mon, 07 Aug 2006 11:07:01 -0700 ocfs2: allocation hints Record the most recently used allocation group on the allocation context, so that subsequent allocations can attempt to optimize for contiguousness. Local alloc especially should benefit from this as the current chain search tends to let it spew across the disk. Signed-off-by: Mark Fasheh commit 7bf72edee614e10b8d470c40a326f47bfdd69992 tree 8309812d2e256da821d2774a5a719663038093fa parent 101ebf256de54e78e6d3277adacf656e125a2c5a author Mark Fasheh Wed, 03 May 2006 17:46:50 -0700 committer Mark Fasheh Mon, 07 Aug 2006 11:04:38 -0700 ocfs2: better group descriptor consistency checks Try to catch corrupted group descriptors with some stronger checks placed in a couple of strategic locations. Detect a failed resizefs and refuse to allocate past what bitmap i_clusters allows. Signed-off-by: Mark Fasheh commit 101ebf256de54e78e6d3277adacf656e125a2c5a tree 73f19064663888bb5379c746459090a3807a2a47 parent 9acd72f4240429dfd762c9a2c7eb5c18b5d32529 author Mark Fasheh Tue, 02 May 2006 17:54:45 -0700 committer Mark Fasheh Mon, 07 Aug 2006 11:04:07 -0700 ocfs2: limit cluster bitmap information saved at mount We were storing cluster count on the ocfs2_super structure, but never actually using it so remove that. Also, we don't want to populate the uptodate cache with the unlocked block read - it is technically safe as is, but we should change it for correctness. Signed-off-by: Mark Fasheh commit 9acd72f4240429dfd762c9a2c7eb5c18b5d32529 tree 01d0a01072ef642861c1534aad30f72c837a8e74 parent 34e3d180370c44ad3ecd3a1f9099e150d3bb103f author Adrian Bunk Sat, 15 Jul 2006 02:36:01 +0200 committer Mark Fasheh Mon, 07 Aug 2006 10:55:50 -0700 [PATCH] fs/ocfs2/dlm/dlmmaster.c: unexport dlm_migrate_lockres This patch removes the unused EXPORT_SYMBOL_GPL(dlm_migrate_lockres). Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 34e3d180370c44ad3ecd3a1f9099e150d3bb103f tree f0e942f11654d3923ddf2c854be5e94572eb52e9 parent a23eac99d4392b8b779305498d7614e41a0e16e9 author Kurt Hackel Sat, 15 Jul 2006 10:22:39 -0700 committer Mark Fasheh Mon, 07 Aug 2006 10:55:22 -0700 ocfs2: fix check for locally granted state during dlmunlock() If a process requests a lock cancel but the lock has been remotely granted already then there is no need to send the cancel message. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit a23eac99d4392b8b779305498d7614e41a0e16e9 tree 29541e6786334eb1556918ff9b24affeb5dbd3e5 parent 4b1af774451bbc8440719e3fe441934a337c3b63 author Kurt Hackel Sun, 18 Jun 2006 21:28:01 -0700 committer Mark Fasheh Mon, 07 Aug 2006 10:54:59 -0700 ocfs2: do not modify lksb->status in the unlock ast This can race with other ast notification, which can cause bad status values to propagate into the unlock ast. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 4b1af774451bbc8440719e3fe441934a337c3b63 tree 98a3e0570887625bab6ccc439d13a2b40a45038b parent 9f737633e6ee54fc174282d49b2559bd2208391d author Kurt Hackel Mon, 26 Jun 2006 15:17:47 -0700 committer Mark Fasheh Mon, 07 Aug 2006 10:54:10 -0700 ocfs2: Fix lvb corruption Properly ignore LVB flags during a PR downconvert. This avoids an illegal lvb update. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 8b384b81e27222a307576630c89ea26e17b7be6a tree 4a601caf262651bc90449ac51999bcaf07cce4b3 parent dbd43d08642c037beb937c2670976c076120507b parent 65200c291c4ce397835d8232eaa0878b765a9bce author Greg Kroah-Hartman Mon, 07 Aug 2006 10:26:49 -0700 committer Greg Kroah-Hartman Mon, 07 Aug 2006 10:26:49 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 commit 5cb900a34f640771a4ab6a178659c75022f2971a tree 111b0b084a7c4011e4e901542c3dc77b6db38a8b parent 37ab46a3f4983c32d5b5ab6a0366ec482e38ba47 author Gerald Schaefer Mon, 07 Aug 2006 18:13:09 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 18:13:09 +0200 [S390] add __cpuinit to appldata_cpu_notify Use __cpuinit for CPU hotplug notifier function. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 37ab46a3f4983c32d5b5ab6a0366ec482e38ba47 tree 99b89f690e9aafc75ad9a563214338483d496c27 parent 65200c291c4ce397835d8232eaa0878b765a9bce author Martin Schwidefsky Mon, 07 Aug 2006 18:13:06 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 18:13:06 +0200 [S390] xpram system device class. Remove system device class for xpram. It creates the directory hierarchy under /sys/devices/system/xpram/xpram0. The xpram0 directory is empty and it is always created while xpram1 and following devices are always missing, independent if the devices exist or not. Since the xpram devices are listed in /proc/partitions and /sys/block/ as slram the system device class for xpram is meaningless. Signed-off-by: Martin Schwidefsky commit 65200c291c4ce397835d8232eaa0878b765a9bce tree 32b6282ae63318d92c630f41a3ca6fd04e4bbbbf parent 4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f author Peter Oberparleiter Mon, 07 Aug 2006 17:00:33 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 17:00:33 +0200 [S390] lost interrupt after chpid vary off/on cycle. I/O on a CCW device may stall if a channel path to that device is logicaly varied off/on. A user I/O interrupt can get misinterpreted as interrupt for an internal path verification operation due to a missing check and is therefore never reported to the device driver. Correct check for pending interruptions before starting path verification. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f tree 6f504c1716d8710025e5a58153b90cd4f2d893f2 parent 25a2001a285e187d99ea347693bedd73b3e0722a author Cornelia Huck Mon, 07 Aug 2006 17:00:30 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 17:00:30 +0200 [S390] retry after deferred condition code. Do a retry of read device characteristics / read configuration data when a deferred condition code 1 is encountered in ccw_device_wake_up(). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 25a2001a285e187d99ea347693bedd73b3e0722a tree beb8855dc37c0593ebc6fe325e208b4696741101 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Heiko Carstens Mon, 07 Aug 2006 17:00:28 +0200 committer Martin Schwidefsky Mon, 07 Aug 2006 17:00:28 +0200 [S390] tape class return value handling. Without this patch register_tape_dev() will always fail, but might return a value that is not an error number. This will lead to accesses to already freed memory areas... Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit dd2c609c59cd9daeb90d58f3d1bc3813e8987df1 tree 2a37fb9ad8dae6fb051374824d601498ce5a4006 parent 916f3ac680fcc4c142e9acd46161f55533b11760 author Pierre Ossman Mon, 07 Aug 2006 01:40:04 +0200 committer Russell King Mon, 07 Aug 2006 14:47:54 +0100 [MMC] Another stray 'io' reference Another misuse of the global 'io' variable instead of the local 'base'. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit dbd43d08642c037beb937c2670976c076120507b tree 4d44a4b54a731eb290e040345c38ed9e1e7ecc6a parent c34c07d6946ec8969fa71ba03dbb95091f4eb9d3 parent 9f737633e6ee54fc174282d49b2559bd2208391d author Greg Kroah-Hartman Sun, 06 Aug 2006 15:44:39 -0700 committer Greg Kroah-Hartman Sun, 06 Aug 2006 15:44:39 -0700 Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/ commit 916f3ac680fcc4c142e9acd46161f55533b11760 tree 849b825e4e043ed2207f03bcee222a95244e85ce parent c723e08af18e60cda3bbc90e0d6fb688587aeb9f author Pierre Ossman Sun, 06 Aug 2006 22:22:23 +0200 committer Russell King Sun, 06 Aug 2006 21:44:48 +0100 [MMC] Fix base address configuration in wbsd There were some confusion about base I/O variables in the wbsd driver. Seems like things have been working on shear luck so far. The global 'io' variable (used when manually configuring the resources) was used instead of the local 'base' variable. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 574dc0abab6650c5371df15ac708e48fa25bed89 tree 05b870ed38dd30457817c032e495baeee58fde15 parent ca8c100a00e91cf93782008441a2e159c4b49a25 author Russell King Sun, 06 Aug 2006 20:55:33 +0100 committer Russell King Sun, 06 Aug 2006 20:55:33 +0100 [ARM] Fix Acorn platform SCSI driver build failures SCSI folk forgot to fix up all the uses of 'buffer' before deleting this struct member. Do it for them to rescue the resulting build failures. Signed-off-by: Russell King commit ca8c100a00e91cf93782008441a2e159c4b49a25 tree 6c1cf696f4a19537d07220c6818c92bea1758028 parent 8832157bff28e6559fd38fc18433f8bd8803340a author Russell King Sun, 06 Aug 2006 20:53:40 +0100 committer Russell King Sun, 06 Aug 2006 20:53:40 +0100 [ARM] Fix NCR5380-based SCSI card build The NCR5380-based SCSI cards need the SCSI SPI transport selected to build correctly. Signed-off-by: Russell King commit 8832157bff28e6559fd38fc18433f8bd8803340a tree fc4dd247011ec8fa74c1940ad5e329e3635ee84b parent 4c756f4e954186630f6ee91a4da9a4b39fe3618d author Russell King Sun, 06 Aug 2006 11:00:45 +0100 committer Russell King Sun, 06 Aug 2006 11:00:45 +0100 [ARM] Fix pci export warnings Remove duplicate PCI exports from ixp4xx machine class. Signed-off-by: Russell King commit 4c756f4e954186630f6ee91a4da9a4b39fe3618d tree 140210451821915d4b3f6f1cd7c06aa62f5beaf3 parent b39239330858bc99b4d529923ec58e95ff6103f8 author Martin Michlmayr Sun, 06 Aug 2006 09:59:26 +0100 committer Russell King Sun, 06 Aug 2006 09:59:26 +0100 [ARM] 3747/1: Fix compilation error in mach-ixp4xx/gtwx5715-setup.c Patch from Martin Michlmayr Fix the following compilation error in arm/mach-ixp4xx/gtwx5715-setup: CC arch/arm/mach-ixp4xx/gtwx5715-setup.o arch/arm/mach-ixp4xx/gtwx5715-setup.c:110: error: expected identifier or '(' before ‘=’ token arch/arm/mach-ixp4xx/gtwx5715-setup.c:121: error: 'gtwx5715_flash_resource' undeclared here (not in a function) arch/arm/mach-ixp4xx/gtwx5715-setup.c: In function 'gtwx5715_init': arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: 'flash_resource' undeclared (first use in this function) arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: (Each undeclared identifier is reported only once arch/arm/mach-ixp4xx/gtwx5715-setup.c:133: error: for each function it appears in.) make[1]: *** [arch/arm/mach-ixp4xx/gtwx5715-setup.o] Error 1 Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit b39239330858bc99b4d529923ec58e95ff6103f8 tree e82a58619ab19e9b9750a7e806ec9db181c648f3 parent f5d635f649607b09b0b4620d25d028fd2b1b7ea5 author George G. Davis Sun, 06 Aug 2006 09:59:25 +0100 committer Russell King Sun, 06 Aug 2006 09:59:25 +0100 [ARM] 3745/1: Add EXPORT_SYMBOL(rtc_next_alarm_time) to ARM rtctime.c Patch from George G. Davis Fix "WARNING: "rtc_next_alarm_time" [drivers/rtc/rtc-sa1100.ko] undefined!" Signed-off-by: George G. Davis Signed-off-by: Russell King commit c723e08af18e60cda3bbc90e0d6fb688587aeb9f tree 54d5aeb522be373c1cae8b4e41e6d515512999c2 parent f5d635f649607b09b0b4620d25d028fd2b1b7ea5 author Juha [êölä Sun, 06 Aug 2006 09:58:22 +0100 committer Russell King Sun, 06 Aug 2006 09:58:22 +0100 [ARM] 3744/1: MMC: mmcqd gets stuck when block queue is plugged Patch from Juha [êölä When the block queue is plugged, mq->req must be set to NULL. Otherwise mq->req might be left non-NULL, even though mmcqd is not processing a request, thus preventing the MMC queue thread from being woken up when new requests do arrive. Signed-off-by: Juha Yrjola Signed-off-by: Russell King commit c34c07d6946ec8969fa71ba03dbb95091f4eb9d3 tree cc3b2b288177e85d444380e9ed7e149028d04a31 parent bce896984c59bcb0804e9eccc19163dccbff064b parent 558e10a57db10de355ee97712d2b6df49e9b7849 author Greg Kroah-Hartman Sat, 05 Aug 2006 23:22:42 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 23:22:42 -0700 Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit bce896984c59bcb0804e9eccc19163dccbff064b tree ab63719956f7605967e8705c1e6a357d9b4aa2dc parent 40a64fa8ca3f41a3178e1bdcfe9734c1ba3e175f parent 6cb53e7ed77d429531afa8d822d59909f953a771 author Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:32 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:32 -0700 Merge http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa commit 40a64fa8ca3f41a3178e1bdcfe9734c1ba3e175f tree f61393418c5a17d71aebcec8512a743c0097af2e parent 91a2eb28f0aa1c1425a5999e0cc5f9095f1b2629 parent 2ffc1ccad85e8c2e81a6a4beb390fb4ce143256b author Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:00 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 10:49:00 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input commit 91a2eb28f0aa1c1425a5999e0cc5f9095f1b2629 tree b9d8c7200458360fd4b745668e5bea8522f00f18 parent 53c7d2b7706526bf262ac10eb52d602d1520458a parent f5d635f649607b09b0b4620d25d028fd2b1b7ea5 author Greg Kroah-Hartman Sat, 05 Aug 2006 10:48:52 -0700 committer Greg Kroah-Hartman Sat, 05 Aug 2006 10:48:52 -0700 Merge ../torvalds-2.6/ commit 77f3f879387cc5fce6c7a4ca7777c586fe6291cd tree 86cdb66936984d02bd1da3a84deec72fd805400d parent 6543bc0777fadf129d8ee7ac82e0090fb0480403 author Tejun Heo Sat, 05 Aug 2006 03:59:19 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:19 +0900 [PATCH] libata: fix ata_device_add() error path In the error path, ata_device_add() * dereferences null host_set->ports[] element. * calls scsi_remove_host() on not-yet-added shost. This patch fixes both bugs. The first problem was spotted and initial patch submitted by Dave Jones . The second problem was mentioned and fixed by Jeff Garzik in a larger cleanup patch. Cc: Dave Jones Cc: Jeff Garzik Signed-off-by: Tejun Heo commit 6543bc0777fadf129d8ee7ac82e0090fb0480403 tree 6fc9ea06f1d70e3c6553c8ed7bc609914b13668a parent f31e945c50e47b7163c6018928aa93b66e8f22f0 author Jeff Garzik Sat, 05 Aug 2006 03:59:17 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:17 +0900 [PATCH] [libata] manually inline ata_host_remove() (tj: this is for the following ata_device_add() fix) Signed-off-by: Jeff Garzik Signed-off-by: Tejun Heo commit f31e945c50e47b7163c6018928aa93b66e8f22f0 tree 5a18319154ddd1e2a66cc18009daa92eb8cae337 parent f814b75f4ed2ed58cd7bc876a0a9406f984aac6d author Tejun Heo Sat, 05 Aug 2006 03:59:15 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:15 +0900 [PATCH] sata_sil24: don't set probe_ent->mmio_base sata_sil24 doesn't make use of probe_ent->mmio_base and setting this field causes the area to be released twice on detach. Don't set probe_ent->mmio_base. Signed-off-by: Tejun Heo commit f814b75f4ed2ed58cd7bc876a0a9406f984aac6d tree d68255e3203532e98be7ee8afca240205a66e039 parent c3cf30a989efec8144225517e0b2f82c955e3966 author Tejun Heo Sat, 05 Aug 2006 03:59:13 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:13 +0900 [PATCH] ata_piix: fix host_set private_data intialization To get host_set->private_data initialized reliably, all pinfos need to point to the same hpriv. Restore pinfo->private_data after pata pinfo assignment. Signed-off-by: Tejun Heo commit c3cf30a989efec8144225517e0b2f82c955e3966 tree 0f4a134253a6e6d306509d617201dbea346b9536 parent f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 author Tejun Heo Sat, 05 Aug 2006 03:59:11 +0900 committer Tejun Heo Sat, 05 Aug 2006 03:59:11 +0900 [PATCH] libata: fix ata_port_detach() for old EH ports ata_prot_detach() did nothing for old EH ports and thus SCSI hosts associated with those ports are left dangling after they are detached leaving stale devices and causing oops eventually. Make ata_port_detach() remove SCSI hosts for old EH ports. Signed-off-by: Tejun Heo commit 782a6675119c76c071e74e2ddd98268f47770cba tree 83815eb8984242ec93a632694d0d243ec8ccd691 parent efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 author Herbert Xu Thu, 03 Aug 2006 23:54:41 +1000 committer John W. Linville Fri, 04 Aug 2006 14:57:19 -0400 [PATCH] Send wireless netlink events with a clean slate Drivers expect to be able to call wireless_send_event in arbitrary contexts. On the other hand, netlink really doesn't like being invoked in an IRQ context. So we need to postpone the sending of netlink skb's to a tasklet. Signed-off-by: Herbert Xu Signed-off-by: John W. Linville commit 53c7d2b7706526bf262ac10eb52d602d1520458a tree 8dd9f936ccbcb5479f27edaf7c903fe9826932f2 parent efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 parent 8bcb2839b74d605f5549962a6e69dc07768e95b6 author Greg Kroah-Hartman Thu, 03 Aug 2006 22:44:55 -0700 committer Greg Kroah-Hartman Thu, 03 Aug 2006 22:44:55 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 commit 8bcb2839b74d605f5549962a6e69dc07768e95b6 tree 3cb69aeaedc8444ed91882ac63714b52a2df6836 parent 115ff50bade0f93a288677745a5884def6cbf9b1 author Dave Kleikamp Fri, 28 Jul 2006 08:46:05 -0500 committer Dave Kleikamp Fri, 28 Jul 2006 08:46:05 -0500 JFS: Fix bug in quota code. tmp_bh.b_size must be initialized Signed-off-by: Dave Kleikamp commit 115ff50bade0f93a288677745a5884def6cbf9b1 tree a646404a99d0587ea0113a2c6dad71d7854a84d4 parent 64821324ca49f24be1a66f2f432108f96a24e596 author Dave Kleikamp Wed, 26 Jul 2006 14:52:13 -0500 committer Dave Kleikamp Wed, 26 Jul 2006 14:52:13 -0500 JFS: Quota support broken, no quota_read and quota_write jfs_quota_read/write are very near duplicates of ext2_quota_read/write. Cleaned up jfs_get_block as long as I had to change it to be non-static. Signed-off-by: Dave Kleikamp