commit d2532dd20a126020de407c1c2476a75b53fce7ac Merge: 7f8ed18... f2b2b59... Author: Linus Torvalds Date: Sat Mar 22 17:07:59 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Fix MSS calculation on RDMA path commit 7f8ed1855d7f23eb5fa1b5d2f890b748ecf95179 Merge: 0d995b2... ca4e2ab... Author: Linus Torvalds Date: Sat Mar 22 17:06:57 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: Revert "ide-tape: schedule driver for removal after 6 months" ide: mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted ide: mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted ide: Documentation/ide/ide.txt fixes ide: mark special "ide0=" kernel parameters as obsoleted ide: remove commented out entries from ide_pio_blacklist[] commit 0d995b2b446c2304c04058bedba49460823adbf7 Merge: 130eb46... 04b6e6e... Author: Linus Torvalds Date: Sat Mar 22 17:05:31 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Fix mem leak on dfs referral [CIFS] file create with acl support enabled is slow [CIFS] Fix mtime on cp -p when file data cached but written out too late [CIFS] Fix build problem [CIFS] cifs: replace remaining __FUNCTION__ occurrences [CIFS] DFS patch that connects inode with dfs handling ops commit 130eb4653550ff9c73e09858464446cc9d59ff7b Merge: f16278c... 9e96304... Author: Linus Torvalds Date: Sat Mar 22 17:04:58 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: revert: reserve dma32 early for gart commit f16278c679aa72e28288435b313ba2d4494d6be5 Author: Hans Rosenfeld Date: Fri Mar 21 18:46:59 2008 -0500 Change pagemap output format to allow for future reporting of huge pages Change pagemap output format to allow for future reporting of huge pages. (Format comment and minor cleanups: mpm@selenic.com) Signed-off-by: Hans Rosenfeld Signed-off-by: Matt Mackall Signed-off-by: Linus Torvalds commit 51ec92e295d563dd5712d198a7e46c2ae5ccccb2 Author: Pierre Ossman Date: Fri Mar 21 23:54:50 2008 +0100 mmc: use sysfs groups to handle conditional attributes Suppressing uevents turned out to be a bad idea as it screws up the order of events, making user space very confused. Change the system to use sysfs groups instead. This is a regression that, for some odd reason, has gone unnoticed for some time. It confuses hal so that the block devices (which have the mmc device as a parent) are not registered. End result being that desktop magic when cards are inserted won't work. Signed-off-by: Pierre Ossman Signed-off-by: Linus Torvalds commit 03c086a747d0b242878eb881971ec61c1555869d Author: Darren Salt Date: Thu Mar 13 15:35:49 2008 +0000 PNP: increase the number of PnP memory resources from 12 to 24 Increase the number of PnP memory resources from 12 to 24. This removes an "exceeded the max num of mem resources" warning on boot. I also noticed the reservation of two more iomem ranges on the computer on which this was tested. Signed-off-by: Darren Salt Signed-off-by: Ingo Molnar Acked-by: Bjorn Helgaas Signed-off-by: Linus Torvalds commit 245073f0b3a8b8b626f3222dacb483695bf46419 Author: Bjorn Helgaas Date: Fri Mar 21 12:08:37 2008 -0600 ISAPNP: fix limits of logical device register set PNP_MAX_MEM and PNP_MAX_PORT are mainly used to size tables of PNP device resources. In 2.6.24, we increased their values to accomodate ACPI devices that have many resources: 2.6.23 2.6.24 ------ ------ PNP_MAX_MEM 4 12 PNP_MAX_PORT 8 40 However, ISAPNP also used these constants as the size of parts of the logical device register set. This register set is fixed by hardware, so increasing the constants meant that we were reading and writing unintended parts of the register set. This patch changes ISAPNP to use the correct register set sizes (the same values we used prior to 2.6.24). Signed-off-by: Bjorn Helgaas Signed-off-by: Linus Torvalds commit 04b6e6ec1a9340ab77637cae9b51b984d9d706d8 Author: Steve French Date: Sat Mar 22 22:57:44 2008 +0000 [CIFS] Fix mem leak on dfs referral Signed-off-by: Igor Mammedov Signed-off-by: Steve French commit 9e9630481ee8ef33f1cce71ce3636169fa37cd49 Author: Thomas Gleixner Date: Sat Mar 22 14:13:06 2008 +0100 x86: revert: reserve dma32 early for gart Revert commit f62f1fc9ef94f74fda2b456d935ba2da69fa0a40 Author: Yinghai Lu Date: Fri Mar 7 15:02:50 2008 -0800 x86: reserve dma32 early for gart The patch has a dependency on bootmem modifications which are not .25 material that late in the -rc cycle. The problem which is addressed by the patch is limited to machines with 256G and more memory booted with NUMA disabled. This is not a .25 regression and the audience which is affected by this problem is very limited, so it's safer to do the revert than pulling in intrusive bootmem changes right now. Signed-off-by: Thomas Gleixner commit ca4e2ab5b2764562fe3d41b95b27e6bbd4733d66 Author: Bartlomiej Zolnierkiewicz Date: Sat Mar 22 16:44:27 2008 +0100 Revert "ide-tape: schedule driver for removal after 6 months" This reverts commit d48567dd43868b3d2e1fcc33ee76dc2d38a1ddeb. Borislav is working on ide-tape "light" version instead. Cc: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit d708c40da83a86551556999e924e27fdc43dad71 Author: Bartlomiej Zolnierkiewicz Date: Sat Mar 22 16:40:22 2008 +0100 ide: mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted Mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted (they are layering violation and should be dealt with in the same way as done by libata - device-mapper should be used instead). Signed-off-by: Bartlomiej Zolnierkiewicz commit 15220d9b5a7e6f4ff251350b285674ed676e0d3d Author: Bartlomiej Zolnierkiewicz Date: Sat Mar 22 16:40:21 2008 +0100 ide: mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted Mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted (nowadays device-driver binding can be changed at runtime through sysfs and it can also be dealt with using per device driver parameters). Signed-off-by: Bartlomiej Zolnierkiewicz commit ad1c53bcdb831e14b1313ad694d5053ae0349393 Author: Bartlomiej Zolnierkiewicz Date: Sat Mar 22 16:40:21 2008 +0100 ide: Documentation/ide/ide.txt fixes * "hdx=cyls,heads,sects,wpcom,irq" should be "hdx=cyls,heads,sects". * "hdx=" is for "x" from 'a' to 'u', "idex=" is for "x" from '0' to '9'. * "idex=noautotune" is long gone. * Obsoleted "ide0=" parameters were already removed from the documentation. Signed-off-by: Bartlomiej Zolnierkiewicz commit 9c027c684bd01b91a7aecc63161b56071685ce7d Author: Bartlomiej Zolnierkiewicz Date: Sat Mar 22 16:40:21 2008 +0100 ide: mark special "ide0=" kernel parameters as obsoleted Mark "ide0=ali14xx|cmd640_vlb|dtc2278|ht6560b|qd65xx|umc8672" kernel parameters as obsoleted (per host driver replacements have been available for a long time). Signed-off-by: Bartlomiej Zolnierkiewicz commit 37ff9f3953dfa7262be091e431cd0eb368c38080 Author: Bartlomiej Zolnierkiewicz Date: Sat Mar 22 16:40:20 2008 +0100 ide: remove commented out entries from ide_pio_blacklist[] Signed-off-by: Bartlomiej Zolnierkiewicz commit f2b2b59b93082d02ee5ec8fda4ed94f498551a47 Author: Chien Tung Date: Thu Mar 20 19:55:30 2008 -0500 RDMA/nes: Fix MSS calculation on RDMA path Fix the calculation of the MSS for RDMA connections: we need to allow space in frames for a VLAN tag too. Signed-off-by: Chien Tung Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit a57543376c99e4d074516c5bf23c7ddc1dc613a0 Author: Mark Fasheh Date: Fri Mar 21 10:40:31 2008 -0700 ocfs2: MAINTAINERS update Change my e-mail address, add Joel as new co-maintainer. Signed-off-by: Mark Fasheh commit 028011e1391eab27e7bc113c2ac08d4f55584a75 Merge: 37bff62... 22e52b0... Author: Linus Torvalds Date: Fri Mar 21 10:05:19 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: sched: add arch_update_cpu_topology hook. sched: add exported arch_reinit_sched_domains() to header file. sched: remove double unlikely from schedule() sched: cleanup old and rarely used 'debug' features. commit 37bff62e98f675777e1e76173fe320f04062841d Author: Yinghai Lu Date: Tue Mar 18 12:40:04 2008 -0700 x86_64: free_bootmem should take phys so use nodedata_phys directly. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 7800c0c3b146013e1e8439e91dc1236a55871d21 Author: Matti Linnanvuori Date: Sun Mar 16 02:47:35 2008 -0700 sync_bitops: fix wrong comments [Bug 10247] Fix wrong function name and references to non-x86 architectures. Signed-off-by: Matti Linnanvuori mattilinnanvuori@yahoo.com Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 5dca6a1bb014875a17289fdaae8c31e0a3641c99 Author: Yinghai Lu Date: Tue Mar 18 16:44:19 2008 -0700 x86: trim mtrr don't close gap for resource allocation. fix the bug reported here: http://bugzilla.kernel.org/show_bug.cgi?id=10232 use update_memory_range() instead of add_memory_range() directly to avoid closing the gap. ( the new code only affects and runs on systems where the MTRR workaround triggers. ) Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit fc1c8925c8210009c1fc5d909d189252d8fb4fb2 Author: Heinz-Ado Arnolds Date: Wed Mar 12 16:27:56 2008 +0100 x86: fix reboot problem with Dell Optiplex 745, 0KW626 board we have seen a little problem in rebooting Dell Optiplex 745 with the 0KW626 board. Here is a small patch enabling reboot with this board, which forces the default reboot path it into the BIOS reboot mode. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit e215f3c2c5247b727a76f28de4b3e46def950c55 Author: Jiri Slaby Date: Wed Mar 12 14:53:53 2008 +0100 x86: fix fault_msg nul termination The fault_msg text is not explictly nul terminated now in startup assembly. Do so by converting .ascii to .asciz. Signed-off-by: Jiri Slaby Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 2050d45d7c32cbad7a070d04256237144a0920db Author: Pavel Machek Date: Thu Mar 13 23:05:41 2008 +0100 x86: fix long standing bug with usb after hibernation with 4GB ram aperture_64.c takes a piece of memory and makes it into iommu window... but such window may not be saved by swsusp -- that leads to oops during hibernation. Signed-off-by: Pavel Machek Acked-by: "Rafael J. Wysocki" Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 96bcf458cbc71fc08f4d10e0b5bf1b18702b2344 Author: Zbigniew Luszpinski Date: Wed Mar 19 15:51:50 2008 +0100 x86: hpet clock enable quirk on nVidia nForce 430 this patch allows hpet=force on nVidia nForce 430 southbridge. This patch was tested by me on my old Asus A8N-VM CSM (where bios does not support hpet and does not advertise it via acpi entry). My nForce430 version: lspci -nn | grep LPC 00:0a.0 ISA bridge [0601]: nVidia Corporation MCP51 LPC Bridge [10de:0260] (rev a2) Kernel 2.6.24.3 after patching and using hpet=force reports this: dmesg | grep -i hpet Kernel command line: root=/dev/sda8 ro vga=773 video=vesafb:mtrr:4,ywrap vt.default_utf8=0 hpet=force Force enabled HPET at base address 0xfed00000 hpet clockevent registered Time: hpet clocksource has been installed. grep -i hpet /proc/timer_list Clock Event Device: hpet set_next_event: hpet_legacy_next_event set_mode: hpet_legacy_set_mode grep Clock /proc/timer_list (before patching) Clock Event Device: pit Clock Event Device: lapic grep Clock /proc/timer_list (after patching) Clock Event Device: hpet Clock Event Device: lapic Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f62f1fc9ef94f74fda2b456d935ba2da69fa0a40 Author: Yinghai Lu Date: Fri Mar 7 15:02:50 2008 -0800 x86: reserve dma32 early for gart a system with 256 GB of RAM, when NUMA is disabled crashes the following way: Your BIOS doesn't leave a aperture memory hole Please enable the IOMMU option in the BIOS setup This costs you 64 MB of RAM Cannot allocate aperture memory hole (ffff8101c0000000,65536K) Kernel panic - not syncing: Not enough memory for aperture Pid: 0, comm: swapper Not tainted 2.6.25-rc4-x86-latest.git #33 Call Trace: [] panic+0xb2/0x190 [] ? release_console_sem+0x7c/0x250 [] ? __alloc_bootmem_nopanic+0x48/0x90 [] ? free_bootmem+0x29/0x50 [] gart_iommu_hole_init+0x5e7/0x680 [] ? alloc_large_system_hash+0x16b/0x310 [] ? _etext+0x0/0x1 [] pci_iommu_alloc+0x1c/0x40 [] mem_init+0x45/0x1a0 [] start_kernel+0x295/0x380 [] _sinittext+0x1c2/0x230 the root cause is : memmap PMD is too big, [ffffe200e0600000-ffffe200e07fffff] PMD ->ffff81383c000000 on node 0 almost near 4G..., and vmemmap_alloc_block will use up the ram under 4G. solution will be: 1. make memmap allocation get memory above 4G... 2. reserve some dma32 range early before we try to set up memmap for all. and release that before pci_iommu_alloc, so gart or swiotlb could get some range under 4g limit for sure. the patch is using method 2. because method1 may need more code to handle SPARSEMEM and SPASEMEM_VMEMMAP will get Your BIOS doesn't leave a aperture memory hole Please enable the IOMMU option in the BIOS setup This costs you 64 MB of RAM Mapping aperture over 65536 KB of RAM @ 4000000 Memory: 264245736k/268959744k available (8484k kernel code, 4187464k reserved, 4004k data, 724k init) Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit fc115bf19b5b2f383614b264569fb48a43bfe56d Author: Coleman Kane Date: Tue Mar 4 15:05:41 2008 -0800 x86: add the DFF (Desktop Form Factor) Dell Optiplex 745 to the reboot errata list We recently got some of the "Desktop Form Factor" Optiplex 745's in. I noticed that there's an entry for the SFF one's, but the BIOS model number of the DFF differs from that of the SFF. We have been reliably experiencing the same (as far as I can tell) reboot bug as the SFF boxes. Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 31780715605f7fd09a06f509d677cd538104baa9 Author: Randy Dunlap Date: Tue Mar 4 14:55:47 2008 -0800 x86/visws: fix printk format warnings Fix visws printk format warnings: /local/linsrc/linux-2.6.24-git15/arch/x86/mach-visws/traps.c:50: warning: format '%#lx' expects type 'long unsigned int', but argument 2 has type 'u32' /local/linsrc/linux-2.6.24-git15/arch/x86/mach-visws/traps.c:50: warning: format '%#lx' expects type 'long unsigned int', but argument 3 has type 'u32' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f2f7abcb96f03a7a42c13063ad556fc80e345c71 Author: Chuck Lever Date: Tue Mar 4 14:55:45 2008 -0800 x86: fix {clear,copy}_user_page() declarations in page.h Clean up: eliminate some compiler noise on x86 when building with strict warnings enabled, introduced by commit 345b904c. In file included from include2/asm/thread_info_64.h:12, from include2/asm/thread_info.h:4, from /home/cel/src/linux/nfs-2.6/include/linux/thread_info.h:35, from /home/cel/src/linux/nfs-2.6/include/linux/preempt.h:9, from /home/cel/src/linux/nfs-2.6/include/linux/spinlock.h:49, from /home/cel/src/linux/nfs-2.6/include/linux/mmzone.h:7, from /home/cel/src/linux/nfs-2.6/include/linux/gfp.h:4, from /home/cel/src/linux/nfs-2.6/include/linux/slab.h:14, from /home/cel/src/linux/nfs-2.6/fs/nfsd/nfs4acl.c:40: include2/asm/page.h:55: warning: `inline' is not at beginning of declaration include2/asm/page.h:61: warning: `inline' is not at beginning of declaration Signed-off-by: Chuck Lever Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 3078b79d257054c3697c85936afce38595e7b67b Author: Mathieu Desnoyers Date: Thu Mar 6 13:45:46 2008 +0100 x86: cast cmpxchg and cmpxchg_local result for 386 and 486 mm/slub.c: In function 'slab_alloc': mm/slub.c:1637: warning: assignment makes pointer from integer without a cast mm/slub.c:1637: warning: assignment makes pointer from integer without a cast mm/slub.c: In function 'slab_free': mm/slub.c:1796: warning: assignment makes pointer from integer without a cast mm/slub.c:1796: warning: assignment makes pointer from integer without a cast A cast is needed in the 386 and 486 code because the type is a pointer. In every other integer case the original cmpxchg code (and the cmpxchg_local which has been copied from it) worked fine, but since we touch a pointer, the type needs to be casted in the cmpxchg_local and cmpxchg macros. The more recent code (586+) does not have this problem (the cast is already there). Signed-off-by: Mathieu Desnoyers Signed-off-by: Thomas Gleixner Reviewed-by: Christoph Lameter Cc: Vegard Nossum Cc: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 7d2de1376226eab4660e162e0728eadd18db3c4a Author: Yinghai Lu Date: Thu Mar 6 18:25:16 2008 -0800 x86: tight online check in setup_per_cpu_areas when numa disabled I got this compile warning: arch/x86/kernel/setup64.c: In function setup_per_cpu_areas: arch/x86/kernel/setup64.c:147: warning: the address of contig_page_data will always evaluate as true it seems we missed checking if the node is online before we try to refer NODE_DATA. Fix it. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 6721fc0a0d87019b08384ac798ca7d51bc5fda4e Author: Yinghai Lu Date: Tue Feb 19 02:21:45 2008 -0800 x86: fix dma_alloc_pages memory-less node support: this patch uses updated dev_to_node, because dev_to_node already makes sure it returns an online node. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 22e52b072dd87faa9b2559fe89d4e8f2370f81ca Author: Heiko Carstens Date: Wed Mar 12 18:31:59 2008 +0100 sched: add arch_update_cpu_topology hook. Will be called each time the scheduling domains are rebuild. Needed for architectures that don't have a static cpu topology. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Ingo Molnar commit 9aefd0abd8610e8f3bb097debf3afb73f8b7b210 Author: Heiko Carstens Date: Wed Mar 12 18:31:58 2008 +0100 sched: add exported arch_reinit_sched_domains() to header file. Needed so it can be called from outside of sched.c. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Ingo Molnar commit 23e3c3cd2e39a3c9d07ee07d882c8cf6ddd61c86 Author: Roel Kluin <12o3l@tiscali.nl> Date: Thu Mar 13 17:41:59 2008 +0100 sched: remove double unlikely from schedule() Combine two unlikely's Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Ingo Molnar commit 2070ee01d314ecec8a570c07647ccf4ced6340bb Author: Peter Zijlstra Date: Fri Mar 21 16:43:47 2008 +0100 sched: cleanup old and rarely used 'debug' features. TREE_AVG and APPROX_AVG are initial task placement policies that have been disabled for a long while.. time to remove them. Signed-off-by: Peter Zijlstra CC: Srivatsa Vaddagiri Signed-off-by: Ingo Molnar commit ae51801ba5ca27c2c571eb508daa99b392e79bd4 Merge: 7d3628b... 4cfea5a... Author: Linus Torvalds Date: Fri Mar 21 08:04:28 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix atomic backoff limit. commit 7d3628b230ecbdc29566c18bc7800ff8ed66a71f Merge: 2c78719... 94833df... Author: Linus Torvalds Date: Fri Mar 21 07:57:45 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits) [NET] ifb: set separate lockdep classes for queue locks [IPV6] KCONFIG: Fix description about IPV6_TUNNEL. [TCP]: Fix shrinking windows with window scaling netpoll: zap_completion_queue: adjust skb->users counter bridge: use time_before() in br_fdb_cleanup() [TG3]: Fix build warning on sparc32. MAINTAINERS: bluez-devel is subscribers-only audit: netlink socket can be auto-bound to pid other than current->pid (v2) [NET]: Fix permissions of /proc/net [SCTP]: Fix a race between module load and protosw access [NETFILTER]: ipt_recent: sanity check hit count [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup() [RT2X00] drivers/net/wireless/rt2x00/rt2x00dev.c: remove dead code, fix warning [IPV4]: esp_output() misannotations [8021Q]: vlan_dev misannotations xfrm: ->eth_proto is __be16 [IPV4]: ipv4_is_lbcast() misannotations [SUNRPC]: net/* NULL noise [SCTP]: fix misannotated __sctp_rcv_asconf_lookup() [PKT_SCHED]: annotate cls_u32 ... commit 2c7871982cf27caaddbaeb7e2121ce1374b520ff Merge: 49ccf74... 49a5ba4... Author: Linus Torvalds Date: Fri Mar 21 07:56:58 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25: sh: Use relative paths for mach/cpu symlinks. SH: Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro. sh: Fix more user header breakage from sh64 integration. sh: Fix uImage build error. sh: Fix up the timer IRQ definition for SH7203. sh: Fix up the address error exception handler for SH-2. serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF. commit 49a5ba46c5d1e34bcb07634157b29d7414ce13bd Author: Franck Bui-Huu Date: Fri Mar 21 12:22:01 2008 +0900 sh: Use relative paths for mach/cpu symlinks. When building the kernel without passing the O= command line parameter there's no point to use absolute paths for them. Usually relative paths are preferred because they survive directory moves, work across networked file systems and chrooted environments. Absolute paths are still used if an output directory is given. Signed-off-by: Franck Bui-Huu Signed-off-by: Paul Mundt commit 40f75879a0dda7025cebc3444c9317ec9e3dcd70 Author: Robert P. J. Day Date: Sat Mar 15 12:49:10 2008 -0400 SH: Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro. Signed-off-by: Robert P. J. Day Signed-off-by: Paul Mundt commit 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 Author: Jarek Poplawski Date: Thu Mar 20 17:05:13 2008 -0700 [NET] ifb: set separate lockdep classes for queue locks [ 10.536424] ======================================================= [ 10.536424] [ INFO: possible circular locking dependency detected ] [ 10.536424] 2.6.25-rc3-devel #3 [ 10.536424] ------------------------------------------------------- [ 10.536424] swapper/0 is trying to acquire lock: [ 10.536424] (&dev->queue_lock){-+..}, at: [] dev_queue_xmit+0x175/0x2f3 [ 10.536424] [ 10.536424] but task is already holding lock: [ 10.536424] (&p->tcfc_lock){-+..}, at: [] tcf_mirred+0x20/0x178 [act_mirred] [ 10.536424] [ 10.536424] which lock already depends on the new lock. lockdep warns of locking order while using ifb with sch_ingress and act_mirred: ingress_lock, tcfc_lock, queue_lock (usually queue_lock is at the beginning). This patch is only to tell lockdep that ifb is a different device (e.g. from eth) and has its own pair of queue locks. (This warning is a false-positive in common scenario of using ifb; yet there are possible situations, when this order could be dangerous; lockdep should warn in such a case.) (With suggestions by David S. Miller) Reported-and-tested-by: Denys Fedoryshchenko Signed-off-by: Jarek Poplawski Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 38fe999e2286139cccdaa500a81bd49a16a81158 Author: YOSHIFUJI Hideaki Date: Thu Mar 20 16:13:58 2008 -0700 [IPV6] KCONFIG: Fix description about IPV6_TUNNEL. Based on notice from "Colin" . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 607bfbf2d55dd1cfe5368b41c2a81a8c9ccf4723 Author: Patrick McHardy Date: Thu Mar 20 16:11:27 2008 -0700 [TCP]: Fix shrinking windows with window scaling When selecting a new window, tcp_select_window() tries not to shrink the offered window by using the maximum of the remaining offered window size and the newly calculated window size. The newly calculated window size is always a multiple of the window scaling factor, the remaining window size however might not be since it depends on rcv_wup/rcv_nxt. This means we're effectively shrinking the window when scaling it down. The dump below shows the problem (scaling factor 2^7): - Window size of 557 (71296) is advertised, up to 3111907257: IP 172.2.2.3.33000 > 172.2.2.2.33000: . ack 3111835961 win 557 <...> - New window size of 514 (65792) is advertised, up to 3111907217, 40 bytes below the last end: IP 172.2.2.3.33000 > 172.2.2.2.33000: . 3113575668:3113577116(1448) ack 3111841425 win 514 <...> The number 40 results from downscaling the remaining window: 3111907257 - 3111841425 = 65832 65832 / 2^7 = 514 65832 % 2^7 = 40 If the sender uses up the entire window before it is shrunk, this can have chaotic effects on the connection. When sending ACKs, tcp_acceptable_seq() will notice that the window has been shrunk since tcp_wnd_end() is before tp->snd_nxt, which makes it choose tcp_wnd_end() as sequence number. This will fail the receivers checks in tcp_sequence() however since it is before it's tp->rcv_wup, making it respond with a dupack. If both sides are in this condition, this leads to a constant flood of ACKs until the connection times out. Make sure the window is never shrunk by aligning the remaining window to the window scaling factor. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8a455b087c9629b3ae3b521b4f1ed16672f978cc Author: Jarek Poplawski Date: Thu Mar 20 16:07:27 2008 -0700 netpoll: zap_completion_queue: adjust skb->users counter zap_completion_queue() retrieves skbs from completion_queue where they have zero skb->users counter. Before dev_kfree_skb_any() it should be non-zero yet, so it's increased now. Reported-and-tested-by: Andrew Morton Signed-off-by: Jarek Poplawski Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2bec008ca9fd009aa503b75344d1c22da9256141 Author: Fabio Checconi Date: Thu Mar 20 15:54:58 2008 -0700 bridge: use time_before() in br_fdb_cleanup() In br_fdb_cleanup() next_timer and this_timer are in jiffies, so they should be compared using the time_after() macro. Signed-off-by: Fabio Checconi Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7582a33557cc6dc42b4c6918c6e7f8e465b72a70 Author: David S. Miller Date: Thu Mar 20 15:53:15 2008 -0700 [TG3]: Fix build warning on sparc32. Sparc MAC address support should be protected consistently with CONFIG_SPARC, but there was a stray CONFIG_SPARC64 case. Bump driver version and release date. Reported by Andrew Morton. Signed-off-by: David S. Miller commit 781c2844845cdc80b19eed3d6e451e65f046b58b Author: Pavel Machek Date: Thu Mar 20 15:41:02 2008 -0700 MAINTAINERS: bluez-devel is subscribers-only Signed-off-by: Pavel Machek Signed-off-by: David S. Miller commit 75c0371a2d385ecbd6e1f854d9dce20889f06736 Author: Pavel Emelyanov Date: Thu Mar 20 15:39:41 2008 -0700 audit: netlink socket can be auto-bound to pid other than current->pid (v2) From: Pavel Emelyanov This patch is based on the one from Thomas. The kauditd_thread() calls the netlink_unicast() and passes the audit_pid to it. The audit_pid, in turn, is received from the user space and the tool (I've checked the audit v1.6.9) uses getpid() to pass one in the kernel. Besides, this tool doesn't bind the netlink socket to this id, but simply creates it allowing the kernel to auto-bind one. That's the preamble. The problem is that netlink_autobind() _does_not_ guarantees that the socket will be auto-bound to the current pid. Instead it uses the current pid as a hint to start looking for a free id. So, in case of conflict, the audit messages can be sent to a wrong socket. This can happen (it's unlikely, but can be) in case some task opens more than one netlink sockets and then the audit one starts - in this case the audit's pid can be busy and its socket will be bound to another id. The proposal is to introduce an audit_nlk_pid in audit subsys, that will point to the netlink socket to send packets to. It will most often be equal to audit_pid. The socket id can be got from the skb's netlink CB right in the audit_receive_msg. The audit_nlk_pid reset to 0 is not required, since all the decisions are taken based on audit_pid value only. Later, if the audit tools will bind the socket themselves, the kernel will have to provide a way to setup the audit_nlk_pid as well. A good side effect of this patch is that audit_pid can later be converted to struct pid, as it is not longer safe to use pid_t-s in the presence of pid namespaces. But audit code still uses the tgid from task_struct in the audit_signal_info and in the audit_filter_syscall. Signed-off-by: Thomas Graf Signed-off-by: Pavel Emelyanov Acked-by: Eric Paris Signed-off-by: David S. Miller commit 4f42c288e66a3395e94158badbd182b2dae8eccb Author: Andre Noll Date: Thu Mar 20 15:27:28 2008 -0700 [NET]: Fix permissions of /proc/net commit e9720ac ([NET]: Make /proc/net a symlink on /proc/self/net (v3)) broke ganglia and probably other applications that read /proc/net/dev. This is due to the change of permissions of /proc/net that was introduced in that commit. Before: dr-xr-xr-x 5 root root 0 Mar 19 11:30 /proc/net After: dr-xr--r-- 5 root root 0 Mar 19 11:29 /proc/self/net This patch restores the permissions to the old value which makes ganglia happy again. Pavel Emelyanov says: This also broke the postfix, as it was reported in bug #10286 and described in detail by Benjamin. Signed-off-by: Andre Noll Acked-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 270637abff0cdf848b910b9f96ad342e1da61c66 Author: Vlad Yasevich Date: Thu Mar 20 15:17:14 2008 -0700 [SCTP]: Fix a race between module load and protosw access There is a race is SCTP between the loading of the module and the access by the socket layer to the protocol functions. In particular, a list of addresss that SCTP maintains is not initialized prior to the registration with the protosw. Thus it is possible for a user application to gain access to SCTP functions before everything has been initialized. The problem shows up as odd crashes during connection initializtion when we try to access the SCTP address list. The solution is to refactor how we do registration and initialize the lists prior to registering with the protosw. Care must be taken since the address list initialization depends on some other pieces of SCTP initialization. Also the clean-up in case of failure now also needs to be refactored. Signed-off-by: Vlad Yasevich Acked-by: Sridhar Samudrala Signed-off-by: David S. Miller commit d0ebf133590abdc035af6e19a6568667af0ab3b0 Author: Daniel Hokka Zakrisson Date: Thu Mar 20 15:07:10 2008 -0700 [NETFILTER]: ipt_recent: sanity check hit count If a rule using ipt_recent is created with a hit count greater than ip_pkt_list_tot, the rule will never match as it cannot keep track of enough timestamps. This patch makes ipt_recent refuse to create such rules. With ip_pkt_list_tot's default value of 20, the following can be used to reproduce the problem. nc -u -l 0.0.0.0 1234 & for i in `seq 1 100`; do echo $i | nc -w 1 -u 127.0.0.1 1234; done This limits it to 20 packets: iptables -A OUTPUT -p udp --dport 1234 -m recent --set --name test \ --rsource iptables -A OUTPUT -p udp --dport 1234 -m recent --update --seconds \ 60 --hitcount 20 --name test --rsource -j DROP While this is unlimited: iptables -A OUTPUT -p udp --dport 1234 -m recent --set --name test \ --rsource iptables -A OUTPUT -p udp --dport 1234 -m recent --update --seconds \ 60 --hitcount 21 --name test --rsource -j DROP With the patch the second rule-set will throw an EINVAL. Reported-by: Sean Kennedy Signed-off-by: Daniel Hokka Zakrisson Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6aebb9b280e5662ece41cf570e25e61795443985 Author: Roel Kluin <12o3l@tiscali.nl> Date: Thu Mar 20 15:06:23 2008 -0700 [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup() logical-bitwise & confusion Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 49ccf74aaf6b53751dc0ae06ded9bb39343da822 Merge: 45ddfbf... f8512ad... Author: Linus Torvalds Date: Thu Mar 20 11:59:34 2008 -0700 Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: nfs: don't ignore return value from nfs_pageio_add_request commit 45ddfbf9594a344dfecbb320d74636023d813539 Merge: d67e911... 10a4c73... Author: Linus Torvalds Date: Thu Mar 20 10:48:01 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: fix panic in handle_at_packet commit d67e91117d104d98635e1b1623aafb26604cecbb Merge: 00c04db... 28aef2f... Author: Linus Torvalds Date: Thu Mar 20 10:20:07 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] a100u2w: fix bitmap lookup routine [SCSI] fix media change events for polled devices [SCSI] sd, sr: do not emit change event at device add [SCSI] mpt fusion: Power Management fixes for MPT SAS PCI-E controllers [SCSI] gdth: Allocate sense_buffer to prevent NULL pointer dereference [SCSI] arcmsr: fix iounmap error for Type B adapter [SCSI] isd200: Allocate sense_buffer for hacked up scsi_cmnd [SCSI] fix bsg queue oops with iscsi logout [SCSI] Fix dependency problems in SCSI drivers [SCSI] advansys: Fix bug in AdvLoadMicrocode commit 10a4c735515a5afc317abe4d697a4c95f6d9d764 Author: Stefan Richter Date: Sun Mar 16 00:56:41 2008 +0100 firewire: fix panic in handle_at_packet This fixes a use-after-free bug in the handling of split transactions. The AT DMA handler of the request was occasionally executed after the AR DMA handler of the response. The AT DMA handler then accessed an already freed packet. Reported by Johannes Berg. http://bugzilla.kernel.org/show_bug.cgi?id=9617 Signed-off-by: Stefan Richter Tested-by: Johannes Berg Signed-off-by: Jarod Wilson commit 00c04db982b66fe9e8c8c5156808b905199bd645 Merge: 6a25a6c... 2a1bf8b... Author: Linus Torvalds Date: Thu Mar 20 09:50:21 2008 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4872/1: Replaces buggy macro in S3C2410 irq include [ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT [ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp [ARM] 4865/1: Register the F75375 device in the GLAN Tank platform code [ARM] 4864/1: Enable write buffer coalescing on IOP [ARM] 4863/1: AT91: CAP9 USART definitions for early debug [ARM] 4861/1: AT91: Update maintainer email address (again) ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt ARM: OMAP: Fix chain_a_transfer return value ARM: OMAP: Fix missing makefile options ARM: OMAP: Fix GPIO IRQ unmask ARM: OMAP: Fix clockevent support for hrtimers commit 6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34 Merge: ba42242... 504e75d... Author: Linus Torvalds Date: Thu Mar 20 09:48:49 2008 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] futex: let futex_atomic_cmpxchg_pt survive early functional tests. commit ba422428295f19a3eef072b47c83202492ccab2f Merge: aedb60a... eee4470... Author: Linus Torvalds Date: Thu Mar 20 09:48:15 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (7367): bug #10211: Fix depencencies for cx2341x V4L/DVB (7362): tvp5150.c: logical-bitwise and confusion V4L/DVB (7334): usb video: add a device link to usbvideo devices, else hal will ignore them V4L/DVB (7330): V4L1 - fix v4l_compat_translate_ioctl possible NULL deref V4L/DVB (7328): usb/opera1.c: fix a memory leak V4L/DVB (7291): em28xx: correct use of and fix V4L/DVB (7285): em28xx: Correct use of ! and & V4L/DVB (7279): ivtv: Add missing sg_init_table() V4L/DVB (7268): saa7134: fix: tuner should be loaded before calling saa7134_board_init2() V4L/DVB (7267): cx88: Fix: Loads tuner module before sending commands to it V4L/DVB (7251): VIDEO_VIVI must depend on VIDEO_DEV V4L/DVB (7242): ivtv: fix for yuv filter table check V4L/DVB (7236): bttv: struct member initialized twice V4L/DVB (7228): saa7134: fix FM radio support for the Pinnacle PCTV 110i commit aedb60a67c10a0861af179725d060765262ba0fb Author: Serge Hallyn Date: Fri Feb 29 15:14:57 2008 +0000 file capabilities: remove cap_task_kill() The original justification for cap_task_kill() was as follows: check_kill_permission() does appropriate uid equivalence checks. However with file capabilities it becomes possible for an unprivileged user to execute a file with file capabilities resulting in a more privileged task with the same uid. However now that cap_task_kill() always returns 0 (permission granted) when p->uid==current->uid, the whole hook is worthless, and only likely to create more subtle problems in the corner cases where it might still be called but return -EPERM. Those cases are basically when uids are different but euid/suid is equivalent as per the check in check_kill_permission(). One example of a still-broken application is 'at' for non-root users. This patch removes cap_task_kill(). Signed-off-by: Serge Hallyn Acked-by: Andrew G. Morgan Earlier-version-tested-by: Luiz Fernando N. Capitulino Acked-by: Casey Schaufler Signed-off-by: Linus Torvalds commit 504e75d0ed3389747e40a4aaa4b1f4e569576665 Author: Heiko Carstens Date: Thu Mar 20 17:33:38 2008 +0100 [S390] futex: let futex_atomic_cmpxchg_pt survive early functional tests. a0c1e9073ef7428a14309cba010633a6cd6719ea "futex: runtime enable pi and robust functionality" introduces a test wether futex in atomic stuff works or not. It does that by writing to address 0 of the kernel address space. This will crash on older machines where addressing mode switching is enabled but where the mvcos instruction is not available. Page table walking is done by hand and therefore the code tries to access current->mm which is NULL. Therefore add an extra check, so we survive the early test. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 2a1bf8b7da2736d85d683fb921ac9a6b71719f37 Merge: a0d1d04... c6b349e... Author: Russell King Date: Thu Mar 20 15:59:51 2008 +0000 Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into m * 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt ARM: OMAP: Fix chain_a_transfer return value ARM: OMAP: Fix missing makefile options ARM: OMAP: Fix GPIO IRQ unmask ARM: OMAP: Fix clockevent support for hrtimers commit a0d1d04ea810481dd0b8790712086a77bc665b8a Author: Davide Rizzo Date: Wed Mar 19 13:51:48 2008 +0100 [ARM] 4872/1: Replaces buggy macro in S3C2410 irq include This is a bug correction for a macro that generated wrong results. Nobody used it in official kernel tree, my driver did. Signed-off-by: Davide Rizzo Acked-by: Ben Dooks Signed-off-by: Russell King commit ee4cd588a3d9f81b5b13b76a498c3118a61f1dd2 Author: janboe Date: Wed Mar 19 03:34:23 2008 +0100 [ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT fix signal return code when enable CONFIG_OABI_COMPAT Signed-off-by: Janboe Ye Signed-off-by: Russell King commit eec2beac278fe5dbf342e0e3f9e56fb64a429d46 Author: Tony Lindgren Date: Mon Mar 17 13:01:07 2008 +0100 [ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp Until DSP MMU code is merged, dsp_request_mem() does not exist. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 4e7ffb6ab4c42740eaf8b8d905e95f106d9eb022 Author: Gordon Farquharson Date: Fri Mar 14 04:07:46 2008 +0100 [ARM] 4865/1: Register the F75375 device in the GLAN Tank platform code This patch adds the code required to register the F75375 device on the GLAN Tank. Signed-off-by: Gordon Farquharson Acked-by: Lennert Buytenhek Signed-off-by: Russell King commit 391c569daa6e4e999592966e29c146dfc4de9a9c Author: Arnaud Patard Date: Thu Mar 13 09:53:21 2008 +0100 [ARM] 4864/1: Enable write buffer coalescing on IOP Some bootloaders are disabling write buffer coalescing. Enable it back under linux. Signed-off-by: Arnaud Patard Signed-off-by: Russell King commit 7d7971db29c078a7946efbe479de5e567a20ba9a Author: Andrew Victor Date: Wed Mar 12 22:33:57 2008 +0100 [ARM] 4863/1: AT91: CAP9 USART definitions for early debug Define AT91_USART0, 1, 2 so the selection of the UART for early kernel messages works. (See commit fa3218d8594869b38b1a170ea36d176ac455b897). Replace AT91_SHDC with AT91_SHDWC to be consistent with other AT91 platforms. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c5215f32ac6cc3d2ec0ca844a171cdcf4c0bab62 Author: Andrew Victor Date: Wed Mar 12 21:29:09 2008 +0100 [ARM] 4861/1: AT91: Update maintainer email address (again) Change email address of AT91 maintainer. This reverts the incorrect change in commit 6650e0a517bbfa1c47aa3da6b3562fcb1a066c63 Signed-off-by: Andrew Victor Signed-off-by: Russell King commit eee4470f197cfe88fd8aa871e9227b7033495b67 Author: Mauro Carvalho Chehab Date: Thu Mar 13 21:08:20 2008 -0300 V4L/DVB (7367): bug #10211: Fix depencencies for cx2341x Fix for build #408 Signed-off-by: Mauro Carvalho Chehab commit 7d5b7b98ae4cbf4c58d143ff7d4516c978e3e555 Author: Roel Kluin <12o3l@tiscali.nl> Date: Sun Mar 9 21:19:13 2008 -0300 V4L/DVB (7362): tvp5150.c: logical-bitwise and confusion logical-bitwise & confusion Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Mauro Carvalho Chehab commit 974a911d2ae310d7082100e9992d1efdf72d86a5 Author: Pascal Terjan Date: Fri Mar 7 08:22:57 2008 -0300 V4L/DVB (7334): usb video: add a device link to usbvideo devices, else hal will ignore them Signed-off-by: Pascal Terjan Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit c77990e754af7443246f24ccb2336bbd62b01cc0 Author: Cyrill Gorcunov Date: Wed Mar 5 20:24:43 2008 -0300 V4L/DVB (7330): V4L1 - fix v4l_compat_translate_ioctl possible NULL deref There are possible NULL pointer derefs in case of kzalloc fails so fix them. Signed-off-by: Cyrill Gorcunov Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 77596058e1c2ad95b566dfdc926611a8dd820ee0 Author: Adrian Bunk Date: Wed Feb 27 21:21:15 2008 -0300 V4L/DVB (7328): usb/opera1.c: fix a memory leak This patch fixes a memory leak in the "testval == 0x67" case spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 46cb57e62824a8d6f9e12bedc98c41738a1478ce Author: Andrew Morton Date: Tue Mar 4 13:09:09 2008 -0300 V4L/DVB (7291): em28xx: correct use of and fix be less silly while we're there. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 8281db3b52c1b0e0bd249e8700cf35e64c1e13bd Author: Julia Lawall Date: Tue Feb 26 20:43:56 2008 -0300 V4L/DVB (7285): em28xx: Correct use of ! and & In commit e6bafba5b4765a5a252f1b8d31cbf6d2459da337, a bug was fixed that involved converting !x & y to !(x & y). The code below shows the same pattern, and thus should perhaps be fixed in the same way. This is not tested and clearly changes the semantics, so it is only something to consider. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ expression E1,E2; @@ ( !E1 & !E2 | - !E1 & E2 + !(E1 & E2) ) // Signed-off-by: Julia Lawall Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 165e1213e13b49761f8b3fd9314701f83cf3db3a Author: Ian Armstrong Date: Tue Feb 26 16:09:00 2008 -0300 V4L/DVB (7279): ivtv: Add missing sg_init_table() If a dma transfer is attempted for either yuv or framebuffer output, a missing sg_init_table() call causes a kernel BUG in scatterlist.h if CONFIG_DEBUG_SG is set. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c030f5e697af1127002a0aeffcd259f9bcff5471 Author: Mauro Carvalho Chehab Date: Tue Feb 19 16:26:33 2008 -0300 V4L/DVB (7268): saa7134: fix: tuner should be loaded before calling saa7134_board_init2() There are several parts of saa7134_board_init2() that calls tuner modules. We should first load tuner, otherwise, the commands will fail. Signed-off-by: Mauro Carvalho Chehab commit 189bf5f05093ff71cec3e2a16d199a85ba035a43 Author: Mauro Carvalho Chehab Date: Tue Feb 19 16:22:25 2008 -0300 V4L/DVB (7267): cx88: Fix: Loads tuner module before sending commands to it Signed-off-by: Mauro Carvalho Chehab commit 2db2da913fb7d10a0281cd856135ef19fc2e67a8 Author: Adrian Bunk Date: Mon Feb 25 00:08:10 2008 -0300 V4L/DVB (7251): VIDEO_VIVI must depend on VIDEO_DEV This patch fixes the following compile error with VIDEO_VIVI=y, VIDEO_DEV=m reported by Toralf Förster: <-- snip --> ... LD .tmp_vmlinux1 drivers/built-in.o: In function `vivi_release': vivi.c:(.text+0x322f5): undefined reference to `video_unregister_device' vivi.c:(.text+0x32337): undefined reference to `video_device_release' drivers/built-in.o: In function `vivi_open': vivi.c:(.text+0x32845): undefined reference to `v4l2_type_names' drivers/built-in.o: In function `vivi_init': vivi.c:(.init.text+0x1d20): undefined reference to `video_device_alloc' vivi.c:(.init.text+0x1d48): undefined reference to `video_register_device' drivers/built-in.o:(.rodata+0x1b40): undefined reference to `video_ioctl2'drivers/built-in.o:(.data+0x140c): undefined reference to `video_device_release' <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit a54d1dea0071a4f6aa46d8e937428c053732efcb Author: Ian Armstrong Date: Sat Jan 26 08:52:58 2008 -0300 V4L/DVB (7242): ivtv: fix for yuv filter table check As the result of a previous change that delayed the loading of the firmware, the driver can sometimes report a bogus error regarding the yuv output filter table not being found in the firmware. This patch moves the filter table check to ensure it's only done after the firmware has been loaded. Signed-off-by: Ian Armstrong Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e8d35932e9942dffcc96c03f539d7e261d641bfd Author: Harvey Harrison Date: Sat Feb 23 07:29:16 2008 -0300 V4L/DVB (7236): bttv: struct member initialized twice fixes sparse warning: drivers/media/video/bt8xx/bttv-driver.c:3391:3: warning: Initializer entry defined twice drivers/media/video/bt8xx/bttv-driver.c:3392:3: also defined here Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit eec25fa7f98f8707eb84fede96f10496adf5047f Author: Yuri Funduryan Date: Sun Feb 17 01:22:37 2008 -0300 V4L/DVB (7228): saa7134: fix FM radio support for the Pinnacle PCTV 110i This also has some coding style fixes. Signed-off-by: Yuri Funduryan Signed-off-by: Hartmut Hackmann Reviewed-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit c6b349ed8a288f1f69fdd560d509d81351cafd89 Author: Will Newton Date: Tue Mar 11 09:47:43 2008 +0000 ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization Fix typo in OMAP1 MPU clock source initialization. Signed-off-by: Will Newton Signed-off-by: Tony Lindgren commit 026a6fef55da7239ca0970000eb62b9eab5ba281 Author: Gadiyar, Anand Date: Sat Mar 8 05:49:13 2008 -0800 ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt Fix CLINK mask, clear spurious interrupt. Signed-off-by: Gadiyar, Anand Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit f4b6a7ef6c64d84e252d32df631813bd09ea3756 Author: Anand Gadiyar Date: Tue Mar 11 01:10:35 2008 +0530 ARM: OMAP: Fix chain_a_transfer return value This patch changes the return value of omap_dma_chain_a_transfer to 0 on success instead of the flag 'start_dma', which wasn't really useful for anything. Signed-off-by: Anand Gadiyar Signed-off-by: Tony Lindgren commit 271c487e9110760c208758ba72971a531f675362 Author: Tony Lindgren Date: Thu Mar 13 15:03:36 2008 +0200 ARM: OMAP: Fix missing makefile options Although audio and dsp drivers are not integrated yet, allow compiling in mailbox and mcbsp to see any build warnings. Signed-off-by: Tony Lindgren commit 4de8c75b00181db8169438e9fa4fb7bdf0db72d5 Author: Kevin Hilman Date: Wed Jan 16 21:56:14 2008 -0800 ARM: OMAP: Fix GPIO IRQ unmask GPIO IRQ unmask doesn't actually do anything useful. The problem is hidden by a separate explicit mass unmask at the end of the chained bank handler. Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 06cad098d28e02d2ee3ed587bb261377e4ae2f17 Author: Kevin Hilman Date: Thu Oct 18 23:04:43 2007 -0700 ARM: OMAP: Fix clockevent support for hrtimers One-shot mode was broken in MPU-timer support for OMAP1 due to a typo. Also, ensure timer is stopped before changing the auto-reload flag. The TRM says changing the AR flag when timer is running is undefined. Also set GENERIC_CLOCKEVENTS for all omaps. Signed-off-by: Tim Bird Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 28aef2f7d9415b881c9145ab9b2c1c234064a243 Author: Akinobu Mita Date: Mon Mar 17 21:32:02 2008 +0900 [SCSI] a100u2w: fix bitmap lookup routine This patch is only compile tested. It seems that bitmap lookup routine for allocation_map in a100u2w driver is simply wrong. It cannot lookup more than first 32 bits. If all first 32 bits are set, it just returns 33-th orc_scb even though the 33-th bit is not set. Signed-off-by: Akinobu Mita Tested-by: Alan Cox Signed-off-by: James Bottomley commit 457fb605834504af294916411be128a9b21fc3f6 Author: Al Viro Date: Wed Mar 19 16:27:48 2008 +0000 drivers/char/rocket portability fixes unsigned long != __le32, TYVM, and unsigned char[4] is not guaranteed to be aligned for u32. While we are at it, sanitize sOutDW() a bit - have it take Byte_t * and handle dereferencing internally. NB: sWriteTxPrioByte() is almost certainly buggered on big-endian and is missing cpu_to_le16() on assignments to *WordPtr; I've left it alone for now. Signed-off-by: Al Viro Acked-by: "Theodore Ts'o" Signed-off-by: Linus Torvalds commit 635440c0235537a3f0a90ed5b6f8cd8a5da862de Merge: de7c6d1... 93ce4e2... Author: Linus Torvalds Date: Wed Mar 19 19:10:56 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Update some defconfigs [POWERPC] Hide resources on Axon PCIE root complex nodes [POWERPC] Fix cell IOMMU code to cope with empty dma-ranges and non-PCI devices [POWERPC] Fix build failure for tqm8540 and sbc85xx defconfigs [POWERPC] Fix PMU + soft interrupt disable bug [POWERPC] user_regset PTRACE_SETREGS regression fix commit de7c6d15e354bc94a846f03749819768c331280a Author: Jaya Kumar Date: Wed Mar 19 17:01:10 2008 -0700 fbdev: defio and Metronomefb Implement support for the E-Ink Metronome controller. It provides an mmapable interface to the controller using defio support. It was tested with a gumstix pxa255 with Vizplex media using Xfbdev and various X clients such as xeyes, xpdf, xloadimage. This patch also fixes the following bug: Defio would cause a hang on write access to the framebuffer as the page fault would be called ad-infinitum. It fixes fb_defio by setting the mapping to be used by page_mkclean. Signed-off-by: Jaya Kumar Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fedc9f1b18f6b931c3b695d7280f17fc308309b Author: David Brownell Date: Wed Mar 19 17:01:09 2008 -0700 rtc-at91sam9 fixes Updates to the at91sam9 rtt-as-rtc driver: - Bugfix: IRQ enable bits need shifting before masking with status - Platform code to initialize wakeup bits didn't get merged; cope Signed-off-by: David Brownell Cc: Justin Waters Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3150e63df41450a795bbd0bd98a8e70da74e0285 Author: Andrew Morton Date: Wed Mar 19 17:01:08 2008 -0700 revert "clocksource: make clocksource watchdog cycle through online CPUs" Revert commit 1ada5cba6a0318f90e45b38557e7b5206a9cba38 ("clocksource: make clocksource watchdog cycle through online CPUs") due to the regression reported by Gabriel C at http://lkml.org/lkml/2008/2/24/281 (short vesion: it makes TSC be marked as always unstable on his machine). Cc: Andi Kleen Acked-by: Ingo Molnar Cc: Thomas Gleixner Cc: Robert Hancock Acked-by: Linus Torvalds Cc: "Rafael J. Wysocki" Cc: Gabriel C Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf821e8f53e3d147ebae03c8c710d2b8842d88a1 Author: Alex Dubov Date: Wed Mar 19 17:01:08 2008 -0700 memstick: optimize setup of JMicron host parameters Set correct clock management values to improve over-all performance. Signed-off-by: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 962ee1b10bff5e99e9ecb2a5f4e6399a0214c9cf Author: Alex Dubov Date: Wed Mar 19 17:01:07 2008 -0700 memstick: add support for 8-bit parallel mode Newer MemoryStick (HG) cards and hosts support 8-bit parallel mode of operation in addition to original 4-bit and 1-bit modes. Signed-off-by: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ead70773608a5d97f81cb492f117d20b5e9f323e Author: Alex Dubov Date: Wed Mar 19 17:01:06 2008 -0700 memstick: automatically retrieve "INT" value from command response MemoryStick storage cards, when in parallel mode, send several meaningful bits of their "INT" register as part of command response. This data is stored by host and can be used to spare invocation of "GET_INT" TPC on each data page transferred between host and card. Signed-off-by: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9df130392fb642ecd5564163b574ce69ffda1afa Author: Andrew Morton Date: Wed Mar 19 17:01:05 2008 -0700 fs/ufs/balloc.c: fix sparc64 printk warning fs/ufs/balloc.c: In function `ufs_change_blocknr': fs/ufs/balloc.c:317: warning: long long unsigned int format, long unsigned int arg (arg 2) fs/ufs/balloc.c:317: warning: long long unsigned int format, long unsigned int arg (arg 3) sector_t is u64 and we don't know what type the architecture uses to implement u64. Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ea85ebae1e05100cdb4807db4f265b0ede7aad8 Author: Andrew Morton Date: Wed Mar 19 17:01:05 2008 -0700 drivers/md/raid5.c: fix printk warnings gcc-3.4.5 on sparc64: drivers/md/raid5.c: In function `raid5_end_read_request': drivers/md/raid5.c:1147: warning: long long unsigned int format, long unsigned int arg (arg 4) drivers/md/raid5.c:1164: warning: long long unsigned int format, long unsigned int arg (arg 3) drivers/md/raid5.c:1170: warning: long long unsigned int format, long unsigned int arg (arg 3) sector_t is u64, and we don't know what type the architecture uses to implement u64 (on some it is unsigned long). Cc: Neil Brown Cc: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8195096bf2e3756264561d7a47d547bafd4e9100 Author: Andrew Morton Date: Wed Mar 19 17:01:04 2008 -0700 memstick: drivers/memstick/host/jmb38x_ms.c: suppress uninitialized var warning drivers/memstick/host/jmb38x_ms.c: In function 'jmb38x_ms_transfer_data': drivers/memstick/host/jmb38x_ms.c:294: warning: 'p_off' may be used uninitialized in this function Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3597ea2f2fa71695ab8204691ff4562aea8357b Author: Andrew Morton Date: Wed Mar 19 17:01:03 2008 -0700 memstick: drivers/memstick/host/jmb38x_ms.c needs dma-mapping.h sparc32: drivers/memstick/host/jmb38x_ms.c: In function 'jmb38x_ms_probe': drivers/memstick/host/jmb38x_ms.c:818: error: 'DMA_32BIT_MASK' undeclared (first use in this function) drivers/memstick/host/jmb38x_ms.c:818: error: (Each undeclared identifier is reported only once drivers/memstick/host/jmb38x_ms.c:818: error: for each function it appears in.) Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7850d932fc69cb4bad83117f0bef1a658cce350 Author: Randy Dunlap Date: Wed Mar 19 17:01:02 2008 -0700 mm/readahead: fix kernel-doc notation Fix kernel-doc notation in mm/readahead.c. Change ":" to ";" so that it doesn't get treated as a doc section heading. Move the comment block ending "*/" to a line by itself so that the text on that last line is not lost (dropped). Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08ca0db8aa2db4ddcf487d46d85dc8ffb22162cc Author: Dave Young Date: Wed Mar 19 17:01:01 2008 -0700 zisofs: fix readpage() outside i_size A read request outside i_size will be handled in do_generic_file_read(). So we just return 0 to avoid getting -EIO as normal reading, let do_generic_file_read do the rest. At the same time we need unlock the page to avoid system stuck. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10227 Signed-off-by: Dave Young Acked-by: Jan Kara Report-by: Christian Perle Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6b91919e0881a0d0a4ae5211d5c879a8c7ca92b Author: Randy Dunlap Date: Wed Mar 19 17:01:00 2008 -0700 fs: fix kernel-doc notation warnings Fix kernel-doc notation warnings in fs/. Warning(mmotm-2008-0314-1449//fs/super.c:560): missing initial short description on line: * mark_files_ro Warning(mmotm-2008-0314-1449//fs/locks.c:1277): missing initial short description on line: * lease_get_mtime Warning(mmotm-2008-0314-1449//fs/locks.c:1277): missing initial short description on line: * lease_get_mtime Warning(mmotm-2008-0314-1449//fs/namei.c:1368): missing initial short description on line: * lookup_one_len: filesystem helper to lookup single pathname component Warning(mmotm-2008-0314-1449//fs/buffer.c:3221): missing initial short description on line: * bh_uptodate_or_lock: Test whether the buffer is uptodate Warning(mmotm-2008-0314-1449//fs/buffer.c:3240): missing initial short description on line: * bh_submit_read: Submit a locked buffer for reading Warning(mmotm-2008-0314-1449//fs/fs-writeback.c:30): missing initial short description on line: * writeback_acquire: attempt to get exclusive writeback access to a device Warning(mmotm-2008-0314-1449//fs/fs-writeback.c:47): missing initial short description on line: * writeback_in_progress: determine whether there is writeback in progress Warning(mmotm-2008-0314-1449//fs/fs-writeback.c:58): missing initial short description on line: * writeback_release: relinquish exclusive writeback access against a device. Warning(mmotm-2008-0314-1449//include/linux/jbd.h:351): contents before sections Warning(mmotm-2008-0314-1449//include/linux/jbd.h:561): contents before sections Warning(mmotm-2008-0314-1449//fs/jbd/transaction.c:1935): missing initial short description on line: * void journal_invalidatepage() Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5366dc9fd1cb74023790a8edf29e4fe42c886dcf Author: Michael Halcrow Date: Wed Mar 19 17:00:58 2008 -0700 eCryptfs: Swap dput() and mntput() ecryptfs_d_release() is doing a mntput before doing the dput. This patch moves the dput before the mntput. Thanks to Rajouri Jammu for reporting this. Signed-off-by: Michael Halcrow Cc: Rajouri Jammu Cc: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae66be9b71b12f16b84129860d06bbfe37fbec51 Author: Paul E. McKenney Date: Wed Mar 19 17:00:57 2008 -0700 rcu: fix misplaced mb() in rcu_enter/exit_nohz() In the process of writing up the mechanical proof of correctness for the dynticks/preemptable-RCU interface, I noticed misplaced memory barriers in rcu_enter_nohz() and rcu_exit_nohz(). This patch puts them in the right place and adds a comment. The key thing to keep in mind is that rcu_enter_nohz() is -exiting- the mode that can legally execute RCU read-side critical sections. The memory barrier must be between any potential RCU read-side critical sections and the increment of the per-CPU dynticks_progress_counter, and thus must come -before- this increment. And vice versa for rcu_exit_nohz(). The locking in the scheduler is probably saving us for the moment. Also, switch to smp_mb() - we don't need a barrier for uniprocessor kernels. Signed-off-by: Paul E. McKenney Acked-by: Steven Rostedt Cc: Nick Piggin Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b691da35ba94d5fa0a32589d99b6546be2bf4cfa Author: Stefan Bauer Date: Wed Mar 19 17:00:55 2008 -0700 i810fb: fix console switch regression Since 4c7ffe0b9f7f40bd818fe3af51342f64c483908e ("fbdev: prevent drivers that have hardware cursors from calling software cursor code") every call of i810fb_cursor fails with -ENXIO because of a incorrect "!". This hasn't struck until eaa0ff15c30dc9799eb4d12660edb73aeb6d32c5 ("fix ! versus & precedence in various places") surrounded the expression with braces, so that the intended behavior was inverted. That caused 'pixel waste' - the same line of multi-colored pixels repeated over the whole screen - during console switch. This switches back to the original pre-4c7ffe0 behavior. Signed-off-by: Stefan Bauer Tested-by: Stefan Bauer Signed-off-by: Geert Uytterhoeven Cc: Antonino Daplas Cc: Henrique de Moraes Holschuh Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d00256766a0b4f1441931a7f569a13edf6c68200 Author: Duane Griffin Date: Wed Mar 19 17:00:54 2008 -0700 jbd2: correctly unescape journal data blocks Fix a long-standing typo (predating git) that will cause data corruption if a journal data block needs unescaping. At the moment the wrong buffer head's data is being unescaped. To test this case mount a filesystem with data=journal, start creating and deleting a bunch of files containing only JBD2_MAGIC_NUMBER (0xc03b3998), then pull the plug on the device. Without this patch the files will contain zeros instead of the correct data after recovery. Signed-off-by: Duane Griffin Acked-by: Jan Kara Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 439aeec639d7c57f3561054a6d315c40fd24bb74 Author: Duane Griffin Date: Wed Mar 19 17:00:53 2008 -0700 jbd: correctly unescape journal data blocks Fix a long-standing typo (predating git) that will cause data corruption if a journal data block needs unescaping. At the moment the wrong buffer head's data is being unescaped. To test this case mount a filesystem with data=journal, start creating and deleting a bunch of files containing only JFS_MAGIC_NUMBER (0xc03b3998), then pull the plug on the device. Without this patch the files will contain zeros instead of the correct data after recovery. Signed-off-by: Duane Griffin Acked-by: Jan Kara Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44e0451db0a9c0bceabaa9cc77cbcc717a094fcc Author: Alessandro Zummo Date: Wed Mar 19 17:00:51 2008 -0700 rtc: fix kconfig help Signed-off-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d252fb870aa9cd227c4beb1a226ecd434f57f28 Author: Ahmed S. Darwish Date: Wed Mar 19 17:00:51 2008 -0700 smack: do not dereference NULL ipc object In the SYSV ipc msgctl(),semctl(),shmctl() family, if the user passed *_INFO as the desired operation, no specific object is meant to be controlled and only system-wide information is returned. This leads to a NULL IPC object in the LSM hooks if the _INFO flag is given. Avoid dereferencing this NULL pointer in Smack ipc *ctl() methods. Signed-off-by: Ahmed S. Darwish Acked-by: Casey Schaufler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ebf89845bea44a164d1fbb8fa319379ec7132de Author: David Howells Date: Wed Mar 19 17:00:50 2008 -0700 ROMFS: Fix up an error in iget removal Fix up an error in iget removal in which romfs_lookup() making a successful call to romfs_iget() continues through the negative/error handling (previously the successful case jumped around the negative/error handling case): (1) inode is initialised to NULL at the top of the function, eliminating the need for specific negative-inode handling. This means the positive success handling now flows straight through. (2) Rename the labels to be clearer about what they mean. Also make romfs_lookup()'s result variable of type long so as to avoid 32-bit/64-bit conversions with PTR_ERR() and friends. Based upon a report and patch from Adam Richter. Signed-off-by: David Howells Acked-by: "Adam J. Richter" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c587f0c0a69227587baaa12e75815b6644457c0a Author: Josef Bacik Date: Wed Mar 19 17:00:49 2008 -0700 ext3: fix wrong gfp type under transaction There are several places where we make allocations with GFP_KERNEL while under a transaction, which could lead to an assertion panic or lockup if under memory pressure. This patch switches these problem areas to use GFP_NOFS to keep these problems from happening. Signed-off-by: Josef Bacik Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffda6857c87fbe3ab144ff3f34b89421eed048cf Author: Darrick J. Wong Date: Wed Mar 19 17:00:48 2008 -0700 ibmpex: report temperatures in mC, not C ibmpex's temperature sensors report incorrect units. Apply a conversion factor so that tempertures report correctly. Until now, no systems seemed to report temperatures this way, but evidently QS2x blades do. Signed-off-by: Darrick J. Wong Cc: "Mark M. Hoffman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d960a99ab1dcf6f395b883c5cca01c2dc150451 Author: Darrick J. Wong Date: Wed Mar 19 17:00:48 2008 -0700 ibmpex: update Kconfig to list more supported models Enhanced the list of supported machines. Signed-off-by: Darrick J. Wong Cc: Mark M. Hoffman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df9cb0339f2c213bea5480464fa669ed4add7445 Author: Darrick J. Wong Date: Wed Mar 19 17:00:47 2008 -0700 ibmpex: correct power use multipliers for QS2x blade The QS2x blades ships with v2.54 of the firmware, which use the same multiplier for all power meters. Signed-off-by: Darrick J. Wong Cc: Mark M. Hoffman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87cb055bc10571522f953925c25bb1a0d1b17605 Author: Jan Kara Date: Wed Mar 19 17:00:46 2008 -0700 quota: add possibly missing iput() when quotaon and quotaoff races We should always put inode we have reference to, even if quota was reenabled in the mean time. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52ea27eb4cd5f250f33638029a134ff03c5e6bbb Author: Pavel Emelyanov Date: Wed Mar 19 17:00:45 2008 -0700 memcgroup: fix check for thread being a group leader in memcgroup The check t->pid == t->pid is not the blessed way to check whether a task is a group leader. This is not about the code beautifulness only, but about pid namespaces fixes - both the tgid and the pid fields on the task_struct are (slowly :( ) becoming deprecated. Besides, the thread_group_leader() macro makes only one dereference :) Signed-off-by: Pavel Emelyanov Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cf01f6685bef41dea37bbec606f375b7a98fd98 Author: Randy Dunlap Date: Wed Mar 19 17:00:44 2008 -0700 jbd: fix jbd kernel-doc notation Fix kernel-doc notation in jbd. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e82989d95cc46cc58622381eafa54f7428ee679 Author: NeilBrown Date: Wed Mar 19 17:00:44 2008 -0700 md: remove the 'super' sysfs attribute from devices in an 'md' array Exposing the binary blob which is the md 'super-block' via sysfs doesn't really fit with the whole sysfs model, and ever since commit 8118a859dc7abd873193986c77a8d9bdb877adc8 ("sysfs: fix off-by-one error in fill_read_buffer()") it doesn't actually work at all (as the size of the blob is often one page). (akpm: as in, fs/sysfs/file.c:fill_read_buffer() goes BUG) So just remove it altogether. It isn't really useful. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43d8eac44f28d384d2377dcdd1407f51f79dda55 Author: Randy Dunlap Date: Wed Mar 19 17:00:43 2008 -0700 mm: rmap kernel-doc fixes Correct kernel-doc function names and parameters in rmap.c. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77f6078aa8945a18a7780694940e52be0322c2b8 Author: Randy Dunlap Date: Wed Mar 19 17:00:42 2008 -0700 mm: highmem kernel-doc additions Add kernel-doc comments to highmem.c. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b578df02207a67a29e8ced4db3b36d89df52fef Author: Randy Dunlap Date: Wed Mar 19 17:00:42 2008 -0700 mm/oom_kill: fix kernel-doc Fix kernel-doc notation in oom_kill.c. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46711810200c50e639ffc52e755b3dba9b4c82a3 Author: Randy Dunlap Date: Wed Mar 19 17:00:41 2008 -0700 mm/shmem and tiny-shmem: fix some kernel-doc Convert tiny-shmem.c function comments to kernel-doc. Add parameters and convert/fix other kernel-doc in shmem.c. Signed-off-by: Randy Dunlap Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7682486b3ee06f800d5b11033371c7c5e92e3057 Author: Randy Dunlap Date: Wed Mar 19 17:00:40 2008 -0700 mm: fix various kernel-doc comments Fix various kernel-doc notation in mm/: filemap.c: add function short description; convert 2 to kernel-doc fremap.c: change parameter 'prot' to @prot pagewalk.c: change "-" in function parameters to ":" slab.c: fix short description of kmem_ptr_validate() swap.c: fix description & parameters of put_pages_list() swap_state.c: fix function parameters vmalloc.c: change "@returns" to "Returns:" since that is not a parameter Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cb2a21049b8990df4576c5fce4d48d0206c22d5 Author: Quentin Barnes Date: Wed Mar 19 17:00:39 2008 -0700 aio: bad AIO race in aio_complete() leads to process hang My group ran into a AIO process hang on a 2.6.24 kernel with the process sleeping indefinitely in io_getevents(2) waiting for the last wakeup to come and it never would. We ran the tests on x86_64 SMP. The hang only occurred on a Xeon box ("Clovertown") but not a Core2Duo ("Conroe"). On the Xeon, the L2 cache isn't shared between all eight processors, but is L2 is shared between between all two processors on the Core2Duo we use. My analysis of the hang is if you go down to the second while-loop in read_events(), what happens on processor #1: 1) add_wait_queue_exclusive() adds thread to ctx->wait 2) aio_read_evt() to check tail 3) if aio_read_evt() returned 0, call [io_]schedule() and sleep In aio_complete() with processor #2: A) info->tail = tail; B) waitqueue_active(&ctx->wait) C) if waitqueue_active() returned non-0, call wake_up() The way the code is written, step 1 must be seen by all other processors before processor 1 checks for pending events in step 2 (that were recorded by step A) and step A by processor 2 must be seen by all other processors (checked in step 2) before step B is done. The race I believed I was seeing is that steps 1 and 2 were effectively swapped due to the __list_add() being delayed by the L2 cache not shared by some of the other processors. Imagine: proc 2: just before step A proc 1, step 1: adds to ctx->wait, but is not visible by other processors yet proc 1, step 2: checks tail and sees no pending events proc 2, step A: updates tail proc 1, step 3: calls [io_]schedule() and sleeps proc 2, step B: checks ctx->wait, but sees no one waiting, skips wakeup so proc 1 sleeps indefinitely My patch adds a memory barrier between steps A and B. It ensures that the update in step 1 gets seen on processor 2 before continuing. If processor 1 was just before step 1, the memory barrier makes sure that step A (update tail) gets seen by the time processor 1 makes it to step 2 (check tail). Before the patch our AIO process would hang virtually 100% of the time. After the patch, we have yet to see the process ever hang. Signed-off-by: Quentin Barnes Reviewed-by: Zach Brown Cc: Benjamin LaHaise Cc: Cc: Nick Piggin Signed-off-by: Andrew Morton [ We should probably disallow that "if (waitqueue_active()) wake_up()" coding pattern, because it's so often buggy wrt memory ordering ] Signed-off-by: Linus Torvalds commit 93ce4e2d2d7404e80d5612fb1cc13d4aad5e42fc Author: Paul Mackerras Date: Thu Mar 20 11:21:32 2008 +1100 [POWERPC] Update some defconfigs Signed-off-by: Paul Mackerras commit ebf3a6509299e46c531f88ee727372bd95cf542a Author: Michael Ellerman Date: Wed Mar 19 17:10:55 2008 +1100 [POWERPC] Hide resources on Axon PCIE root complex nodes The PCI bridge representing the PCIE root complex on Axon, contains device BARs for a memory range and ROM that define inbound accesses. This confuses the kernel resource management code -- the resources need to be hidden when Axon is a host bridge. Signed-off-by: Michael Ellerman Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 3a4295d101d9654ca909b64c786f9da6ca1bf37a Author: Michael Ellerman Date: Fri Mar 14 16:47:39 2008 +1100 [POWERPC] Fix cell IOMMU code to cope with empty dma-ranges and non-PCI devices The cell IOMMU code to parse the dma-ranges properties, used for the fixed mapping, was broken in two ways for some devices. Firstly it didn't cope with empty dma-ranges properties. An empty property implies no translation so can be safely skipped. The code also wrongly assumed it would be looking at PCI devices, and hard coded the number of address and size cells. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit a72a6f53ddb95723960bb64c011457e9739941d7 Author: Paul Gortmaker Date: Tue Mar 18 16:13:10 2008 +1100 [POWERPC] Fix build failure for tqm8540 and sbc85xx defconfigs The wrapper script didn't have entries for the TQM8540 board and the SBC8548 or SBC8560 boards. I've assumed that the TQM8540 console is 8250 based and not CPM based by looking at its defconfig. There was also a trailing * on the TQM8555 entry that I removed too. Signed-off-by: Paul Gortmaker Signed-off-by: Grant Likely Signed-off-by: Paul Mackerras commit 44387e9ff25267c78a99229aca55ed750e9174c7 Author: Anton Blanchard Date: Mon Mar 17 15:27:09 2008 +1100 [POWERPC] Fix PMU + soft interrupt disable bug Since the PMU is an NMI now, it can come at any time we are only soft disabled. We must hard disable around the two places we allow the kernel stack SLB and r1 to go out of sync. Otherwise the PMU exception can force a kernel stack SLB into another slot, which can lead to it getting evicted, which can lead to a nasty unrecoverable SLB miss in the exception entry code. Signed-off-by: Anton Blanchard Acked-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit c2372eb9bcafdd149b26987a8c25bbed92fd2775 Author: Roland McGrath Date: Thu Mar 13 19:25:35 2008 +1100 [POWERPC] user_regset PTRACE_SETREGS regression fix The PTRACE_SETREGS request was only recently added on powerpc, and gdb does not use it. So it slipped through without getting all the testing it should have had. The user_regset changes had a simple bug in storing to all of the 32-bit general registers block on 64-bit kernels. This bug only comes up with PTRACE_SETREGS, not PPC_PTRACE_SETREGS. It causes a BUG_ON to hit, so this fix needs to go in ASAP. Signed-off-by: Roland McGrath Signed-off-by: Paul Mackerras commit f8512ad0da16cbe156f3a7627971cdf0b39c4138 Author: Fred Isaman Date: Wed Mar 19 11:24:39 2008 -0400 nfs: don't ignore return value from nfs_pageio_add_request Ignoring the return value from nfs_pageio_add_request can cause deadlocks. In read path: call nfs_pageio_add_request from readpage_async_filler assume at this point that there are requests already in desc, that can't be merged with the current request. so nfs_pageio_doio is fired up to clear out desc. assume something goes wrong in setting up the io, so desc->pg_error is set. This causes nfs_pageio_add_request to return 0, *WITHOUT* adding the original request. BUT, since return code is ignored, readpage_async_filler assumes it has been added, and does nothing further, leaving page locked. do_generic_mapping_read will eventually call lock_page, resulting in deadlock In write path: page is marked dirty by generic_perform_write nfs_writepages is called call nfs_pageio_add_request from nfs_page_async_flush assume at this point that there are requests already in desc, that can't be merged with the current request. so nfs_pageio_doio is fired up to clear out desc. assume something goes wrong in setting up the io, so desc->pg_error is set. This causes nfs_page_async_flush to return 0, *WITHOUT* adding the original request, yet marking the request as locked (PG_BUSY) and in writeback, clearing dirty marks. The next time a write is done to the page, deadlock will result as nfs_write_end calls nfs_update_request Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 4d1566ed2100d074ccc654e5cf2e44cdea3a01d0 Author: Kay Sievers Date: Wed Mar 19 13:04:47 2008 +0100 [SCSI] fix media change events for polled devices Commit: a341cd0f (SCSI: add asynchronous event notification API) breaks: 285e9670 (sr,sd: send media state change modification events) by introducing an event filter, which is removed here, to make events, we are depending on, happen again. Fix this by removing the event filter. It's pretty much broken at the moment, since a user can't set it (the attribute being read only). A proper fix will be to make the event discriminator distinguish between AN and Polled media change events. Cc: David Zeuthen Cc: kristen accardi Cc: Jeff Garzik Signed-off-by: Kay Sievers Signed-off-by: James Bottomley commit c02e600280c605c761190ef82a6e6fa6aa7fb248 Author: Kay Sievers Date: Wed Mar 19 13:09:56 2008 +0100 [SCSI] sd, sr: do not emit change event at device add Initialize the "state changed" flag, so we do not send a change event immediately after registering a new device. Signed-off-by: Kay Sievers Signed-off-by: James Bottomley commit 4cfea5a7dfcc2766251e50ca30271a782d5004ad Author: David S. Miller Date: Wed Mar 19 01:04:48 2008 -0700 [SPARC64]: Fix atomic backoff limit. 4096 will not fit into the immediate field of a compare instruction, in fact it will end up being -4096 causing the check to fail every time and thus disabling backoff. Signed-off-by: David S. Miller commit 264e3e889d86e552b4191d69bb60f4f3b383135a Merge: d7a0e1f... 8d8002f... Author: Linus Torvalds Date: Tue Mar 18 21:34:48 2008 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: async_tx: avoid the async xor_zero_sum path when src_cnt > device->max_xor fsldma: Fix the DMA halt when using DMA_INTERRUPT async_tx transfer. commit d7a0e1f56472db0825e13f9dd39f0ad79b8c8b3e Author: Alexey Starikovskiy Date: Wed Mar 19 02:45:12 2008 +0300 Revert "ACPI: EC: Handle IRQ storm on Acer laptops" This reverts commit 2c81ce4c9c37b910210f2640c28e98a0c398dc26. It caused several new troubles (eg suspend slowdown bisected down to this patch by Pavel Machek), so just revert it for now. Signed-off-by: Alexey Starikovskiy Cc: Pavel Machek Signed-off-by: Linus Torvalds commit 2caf470363941b70212a9a843cae02e8e2f751d9 Merge: 6c3c315... 33b0c42... Author: Linus Torvalds Date: Tue Mar 18 21:27:13 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: sched: tune multi-core idle balancing sched: retune wake granularity sched: wakeup-buddy tasks are cache-hot sched: improve affine wakeups sched, net: socket wakeups are sync sched: clean up wakeup balancing, code flow sched: clean up wakeup balancing, rename variables sched: clean up wakeup balancing, move wake_affine() commit 6c3c3158a81d6a92d335dd27ad9eb43f6b4c664b Author: Linus Torvalds Date: Tue Mar 18 21:26:24 2008 -0700 IDE: Make taskfile interface more robust wrt unexpected end-of-command Now that we handle all the special commands using REQ_TYPE_ATA_TASKFILE rather than using the old REQ_TYPE_ATA_CMD model, we need to also emulate the lack of full taskfile data that comes with the old command model (ie when commands are generated with the HDIO_DRIVE_CMD ioctl rather than using the HDIO_DRIVE_TASK[FILE] ioctls). In particular, this means that we should handle command completion the more relaxed way that the old drive_cmd_intr() code did. It allows commands to finish early even if they don't use up all the data that we thought we had for them. This fixes a regression seen by Anders Eriksson where some SMART commands sent by smartd would cause a boot-time system hang on his machine because the IDE command handling code didn't realize that the command had completed. Tested-by: Anders Eriksson Cc: Jens Axboe Cc: Ingo Molnar Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Torvalds commit d5eee405723eedbd621275e045ac9b36f668c39f Merge: f920bb6... caeab08... Author: Linus Torvalds Date: Tue Mar 18 21:13:19 2008 -0700 Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm * 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm: slub page alloc fallback: Enable interrupts for GFP_WAIT. commit 33b0c4217dcd67b788318c3192a2912b530e4eef Author: Ingo Molnar Date: Sun Mar 16 11:14:30 2008 +0100 sched: tune multi-core idle balancing WAKE_IDLE is too agressive on multi-core CPUs with the new wake-affine code, keep it on for SMT/HT balancing alone (where there's no cache affinity at all between logical CPUs). Signed-off-by: Ingo Molnar commit 74e3cd7f480ae1888b7cd196bf8125a1d3bfee05 Author: Ingo Molnar Date: Tue Mar 18 18:47:57 2008 +0100 sched: retune wake granularity reduce wake-up granularity for better interactivity. Signed-off-by: Ingo Molnar commit f540a6080a092e2ab69fd146c308022db7347b0a Author: Ingo Molnar Date: Sat Mar 15 17:10:34 2008 +0100 sched: wakeup-buddy tasks are cache-hot Wakeup-buddy tasks are cache-hot - this makes it a bit harder for the load-balancer to tear them apart. (but it's still possible, if the load is sufficiently assymetric) Signed-off-by: Ingo Molnar commit 4ae7d5cefd4aa3560e359a3b0f03e12adc8b5c86 Author: Ingo Molnar Date: Wed Mar 19 01:42:00 2008 +0100 sched: improve affine wakeups improve affine wakeups. Maintain the 'overlap' metric based on CFS's sum_exec_runtime - which means the amount of time a task executes after it wakes up some other task. Use the 'overlap' for the wakeup decisions: if the 'overlap' is short, it means there's strong workload coupling between this task and the woken up task. If the 'overlap' is large then the workload is decoupled and the scheduler will move them to separate CPUs more easily. ( Also slightly move the preempt_check within try_to_wake_up() - this has no effect on functionality but allows 'early wakeups' (for still-on-rq tasks) to be correctly accounted as well.) Signed-off-by: Ingo Molnar commit 6f3d09291b4982991680b61763b2541e53e2a95f Author: Ingo Molnar Date: Wed Mar 19 01:44:24 2008 +0100 sched, net: socket wakeups are sync 'sync' wakeups are a hint towards the scheduler that (certain) networking related wakeups likely create coupling between tasks. Signed-off-by: Ingo Molnar commit f48273860edfca2306236d0f0de609aab3f773d4 Author: Ingo Molnar Date: Sun Mar 16 21:21:47 2008 +0100 sched: clean up wakeup balancing, code flow Clean up the code flow. No code changed: kernel/sched.o: text data bss dec hex filename 42521 2858 232 45611 b22b sched.o.before 42521 2858 232 45611 b22b sched.o.after md5: 09b31c44e9aff8666f72773dc433e2df sched.o.before.asm 09b31c44e9aff8666f72773dc433e2df sched.o.after.asm Signed-off-by: Ingo Molnar commit ac192d3921a14e2c9080799e16959b4bd56f49d6 Author: Ingo Molnar Date: Sun Mar 16 20:56:26 2008 +0100 sched: clean up wakeup balancing, rename variables rename 'cpu' to 'prev_cpu'. No code changed: kernel/sched.o: text data bss dec hex filename 42521 2858 232 45611 b22b sched.o.before 42521 2858 232 45611 b22b sched.o.after md5: 09b31c44e9aff8666f72773dc433e2df sched.o.before.asm 09b31c44e9aff8666f72773dc433e2df sched.o.after.asm Signed-off-by: Ingo Molnar commit 098fb9db2c74cfd6ffdbf61eb026a0c21abc5f75 Author: Ingo Molnar Date: Sun Mar 16 20:36:10 2008 +0100 sched: clean up wakeup balancing, move wake_affine() split out the affine-wakeup bits. No code changed: kernel/sched.o: text data bss dec hex filename 42521 2858 232 45611 b22b sched.o.before 42521 2858 232 45611 b22b sched.o.after md5: 9d76738f1272aa82f0b7affd2f51df6b sched.o.before.asm 09b31c44e9aff8666f72773dc433e2df sched.o.after.asm (the md5's changed because stack slots changed and some registers get scheduled by gcc in a different order - but otherwise the before and after assembly is instruction for instruction equivalent.) Signed-off-by: Ingo Molnar commit 247df4548fdbb0f263aaa0386bbaf52bc359a972 Author: Andrew Morton Date: Tue Mar 18 17:15:58 2008 -0700 [RT2X00] drivers/net/wireless/rt2x00/rt2x00dev.c: remove dead code, fix warning Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8d8002f642886ae256a3c5d70fe8aff4faf3631a Author: Dan Williams Date: Tue Mar 18 21:23:59 2008 -0700 async_tx: avoid the async xor_zero_sum path when src_cnt > device->max_xor If the channel cannot perform the operation in one call to ->device_prep_dma_zero_sum, then fallback to the xor+page_is_zero path. This only affects users with arrays larger than 16 devices on iop13xx or 32 devices on iop3xx. Cc: Cc: Neil Brown Signed-off-by: Dan Williams commit f79abb627f033c85a6088231f20c85bc4a9bd757 Author: Zhang Wei Date: Tue Mar 18 18:45:00 2008 -0700 fsldma: Fix the DMA halt when using DMA_INTERRUPT async_tx transfer. The DMA_INTERRUPT async_tx is a NULL transfer, thus the BCR(count register) is 0. When the transfer started with a byte count of zero, the DMA controller will triger a PE(programming error) event and halt, not a normal interrupt. I add special codes for PE event and DMA_INTERRUPT async_tx testing. Signed-off-by: Zhang Wei Signed-off-by: Andrew Morton Signed-off-by: Dan Williams commit 4d4109d0eb6930e59942d019980b83af679f187b Author: Prakash, Sathya Date: Fri Mar 7 16:19:50 2008 +0530 [SCSI] mpt fusion: Power Management fixes for MPT SAS PCI-E controllers The system power state changes like hibernation and standby are not happening properly with 106XE controllers, this patch modifies the driver to free resources and allocate resources in power management entry points [jejb: compile fixes for upstream] Signed-off-by: Sathya Prakash Signed-off-by: James Bottomley commit f920bb6f5fe21047e669381fe4dd346f6a9d3562 Merge: d324669... 1e0bd75... Author: Linus Torvalds Date: Tue Mar 18 08:43:59 2008 -0700 Merge branch 'audit.b49' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b49' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] export sessionid alongside the loginuid in procfs commit 1e0bd7550ea9cf474b1ad4c6ff5729a507f75fdc Author: Eric Paris Date: Thu Mar 13 08:15:31 2008 -0400 [PATCH] export sessionid alongside the loginuid in procfs Signed-off-by: Eric Paris Signed-off-by: Al Viro commit d32466912ea1f5a0ced568c4884f6c7d335ea969 Merge: 74fe030... 0714664... Author: Linus Torvalds Date: Tue Mar 18 07:49:59 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: update key codes for Apple aluminium HID: fix comment in hid_input_report() HID: BADPAD entry for NATSU Playstation USB adapter HID: Use DIV_ROUND_UP HID: remove HID_QUIRK_APPLE_ISO_KEYBOARD for 4th generation macbook commit 74fe030532d779a3774fcc9e1ddce65f3773e156 Merge: fb00f76... 13d9392... Author: Linus Torvalds Date: Tue Mar 18 07:48:23 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: Set flag DOCK_UNDOCKING when triggered via sysfs Revert "ACPI: video: Ignore devices that aren't present in hardware" asus_acpi: remove misleading mask Revert "ACPI: video: Ignore ACPI video devices that aren't present in hardware" thermal: delete "default y" thermal: re-document thermal units Revert "thermal: fix generic thermal I/F for hwmon" ACPI: fix ATA_ACPI build ACPI: battery: Don't return -EFAIL on broken packages. ACPI: lockdep warning on boot, 2.6.25-rc5 commit fb00f7629bb94ef9189fc3790b95306a144f58c5 Merge: 992ab12... 3c00bb9... Author: Linus Torvalds Date: Tue Mar 18 07:46:19 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ALPS - fix forward/back buttons reversed on Acer 5520-5290 Input: ALPS - put secondary device in proper place in sysfs Input: wacom - add support for Bamboo1, BambooFun, and Cintiq 12WX Input: document i8042.noloop Input: add keyboard notifier documentation Input: ads7846 - fix uninitialized var warning Input: i8042 - add SNI RM support Input: i8042 - add Lenovo 3000 N100 to nomux blacklist Input: i8042 - fix warning on non-x86 builds Input: cobalt_btns - assorted fixes commit 992ab12ac390a8b98b45d03f617481e6265811c0 Merge: 92f53c6... 2e1479d... Author: Linus Torvalds Date: Tue Mar 18 07:44:21 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: make selinux_parse_opts_str() static commit 92f53c6f1e47d92b40b1e9e1662b0056c783b962 Merge: ff69c00... 40044ce... Author: Linus Torvalds Date: Tue Mar 18 07:43:14 2008 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: Revert "unexport bio_{,un}map_user" relay: fix subbuf_splice_actor() adding too many pages The ps2esdi driver was marked as BROKEN more than two years ago due to being commit ff69c00f0a58383f1f60dd2756e54a857f08d249 Merge: 9e58582... b05c238... Author: Linus Torvalds Date: Tue Mar 18 07:32:23 2008 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/ati_pcigart: fix the PCIGART to use drm_pci to allocate GART table. drm/radeon: fixup RV550 chip family drm/via: attempt again to stabilise the AGP DMA command submission. drm: Fix race that can lockup the kernel commit 07146648bc6ea8b1530644c8a41bef55f1b2d952 Author: Michael Hanselmann Date: Mon Mar 17 22:23:52 2008 +0100 HID: update key codes for Apple aluminium F5 and F6 have no second function printed on them. Thus their definitions have been removed from the table. KEY_CYCLEWINDOWS doesn't name the function of Mac OS X' Expose properly and because we couldn't find a better key code, we decided to use KEY_FN_F4 instead. We also changed KEY_BACK and KEY_FORWARD, which apply to browser functions, to KEY_PREVIOUSSONG and KEY_NEXTSONG, since the keys are intended to control a music player. Signed-off-by: Michael Hanselmann Signed-off-by: Jiri Kosina commit dfd347f09c66beed2ae621aad5fd75535b1838d4 Author: Jiri Kosina Date: Tue Mar 4 13:53:33 2008 +0100 HID: fix comment in hid_input_report() The hid_input_report() in debug mode of course outputs the report itself, not the device report descriptor. Fix this error in comment. Signed-off-by: Jiri Kosina commit c9bde7ad39e61424619b6bd7dd6984606b3b6489 Author: Andrew Burton Date: Mon Mar 3 10:49:59 2008 +0100 HID: BADPAD entry for NATSU Playstation USB adapter Add quirk entry for BADPAD for the NATSU Playstation USB adapter. The adapter is supported under Linux, but with bad direction detection. Signed-off-by: Andrew Burton Signed-off-by: Jiri Kosina commit 92c4a1b9f257a242866be13c7c61e7a40616ec52 Author: Julia Lawall Date: Fri Feb 15 13:53:11 2008 +0100 HID: Use DIV_ROUND_UP The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) / (d)) but is perhaps more readable. Signed-off-by: Julia Lawall Signed-off-by: Jiri Kosina commit 790c9d8d87f15827a455b191924aee9b397ce2b1 Author: Tobias Mueller Date: Fri Mar 14 23:44:48 2008 +0100 HID: remove HID_QUIRK_APPLE_ISO_KEYBOARD for 4th generation macbook 4th generation MacBook (product id 0x022a) from Apple doesn't need HID_QUIRK_APPLE_ISO_KEYBOARD fix anymore. Signed-off-by: Tobias Mueller Signed-off-by: Jiri Kosina commit 13d93924f13e1989cf27375cd46451475bc70d1d Merge: d9ea136... 9171f83... Author: Len Brown Date: Tue Mar 18 05:17:15 2008 -0400 Merge branches 'release' and 'dock' into release commit 9171f83488940e4ff85f1b7137773eb1f306cdef Author: Holger Macht Date: Wed Mar 12 01:07:27 2008 +0100 ACPI: Set flag DOCK_UNDOCKING when triggered via sysfs begin_undock() is only called when triggered via a acpi notify handler (pressing the undock button on the dock station), but complete_undock() is always called after the eject. So if a undock is triggered through a sysfs write, the flag DOCK_UNDOCKING has to be set for the dock station, too. Otherwise this will freeze the system hard. Signed-off-by: Holger Macht Acked-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit d9ea1364d37b53710519909ab125a53b0a8ca64f Merge: abc5a87... b8a1bdb... 77321e6... 0ac4a3c... 71e93d1... ece54e2... Author: Len Brown Date: Tue Mar 18 04:52:57 2008 -0400 Merge branches 'release', 'asus', 'bugzilla-8573', 'bugzilla-9995', 'bugzilla-10272', 'lockdep' and 'thermal' into release commit 77321e624b64f1e5985a20f3cd16b94c96d0dbb4 Author: Len Brown Date: Tue Mar 18 04:04:35 2008 -0400 Revert "ACPI: video: Ignore devices that aren't present in hardware" This reverts commit 0119509c4fbc9adcef1472817fda295334612976. http://bugzilla.kernel.org/show_bug.cgi?id=9995 Signed-off-by: Len Brown commit 2f633928cbba8a5858bb39b11e7219a41b0fbef5 Merge: 5e226e4... bde4f8f... Author: David S. Miller Date: Mon Mar 17 23:44:31 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit abc5a87f4e627e058813a95b112e9f5f21668f9d Author: Julia Lawall Date: Tue Mar 4 15:00:13 2008 -0800 asus_acpi: remove misleading mask led_out is boolean, so there is no functional change here, but apparently an extra mask with 1 caused some style checkers to flag this as logic bug. Signed-off-by: Julia Lawall Acked-by: Luca Tettamanti Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5e226e4d9016daee170699f8a4188a5505021756 Author: Al Viro Date: Mon Mar 17 22:50:23 2008 -0700 [IPV4]: esp_output() misannotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 9534f035ee67630688447e8aac91b1d365a51913 Author: Al Viro Date: Mon Mar 17 22:49:48 2008 -0700 [8021Q]: vlan_dev misannotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 8e3d716cce0c186ae9c88b91cc5686b78e0fd2d4 Author: Al Viro Date: Mon Mar 17 22:49:16 2008 -0700 xfrm: ->eth_proto is __be16 Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 0ff9663c88ac5efdb5c8ac21c0bd7f993a4e3849 Author: Al Viro Date: Mon Mar 17 22:48:46 2008 -0700 [IPV4]: ipv4_is_lbcast() misannotations Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 27724426a9000086993a8107a11cff276c4bd4d4 Author: Al Viro Date: Mon Mar 17 22:48:03 2008 -0700 [SUNRPC]: net/* NULL noise Signed-off-by: Al Viro Signed-off-by: David S. Miller commit bc92dd194d05e8334b210552fbc0ac5711d72ea9 Author: Al Viro Date: Mon Mar 17 22:47:32 2008 -0700 [SCTP]: fix misannotated __sctp_rcv_asconf_lookup() Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 0382b9c35469be273ed10fa374496a924055a3c8 Author: Al Viro Date: Mon Mar 17 22:46:46 2008 -0700 [PKT_SCHED]: annotate cls_u32 Signed-off-by: Al Viro Signed-off-by: David S. Miller commit e6f1cebf71c4e7aae7dfa43414ce2631291def9f Author: Al Viro Date: Mon Mar 17 22:44:53 2008 -0700 [NET] endianness noise: INADDR_ANY Signed-off-by: Al Viro Signed-off-by: David S. Miller commit f0d6752c9fa51d24c86b57c76ec5b2926a716b23 Author: Len Brown Date: Tue Mar 18 01:43:53 2008 -0400 Revert "ACPI: video: Ignore ACPI video devices that aren't present in hardware" This reverts commit 3fa2cdcc45a0176de15cac9dbf4ed2834ebf8932. http://bugzilla.kernel.org/show_bug.cgi?id=9995 Signed-off-by: Len Brown commit ece54e2ff45062852e4647e85b2bb5f6aee8211c Author: Len Brown Date: Tue Mar 18 01:22:10 2008 -0400 thermal: delete "default y" The generic thermal I/F gets selected by ACPI_THERMAL -- its only current customer. it doesn't need to clutter other configs by default. Signed-off-by: Len Brown commit 6d7f014e55c5227220da1f021c518487fcfd585a Author: Zhang, Rui Date: Tue Mar 18 10:40:29 2008 +0800 thermal: re-document thermal units From: Zhang Rui (reverting the previous sysfs patch also reverted a fix to the thermal units documentation, which is restored by this commit) The generic thermal driver shows temperature in millidegree Celsius. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 91f57fa1215952af579f304821a15cc6c656042c Author: Len Brown Date: Tue Mar 18 01:14:37 2008 -0400 Revert "thermal: fix generic thermal I/F for hwmon" This reverts commit 3152fb9f11cdd2fd8688c2c5cb805e5c09b53dd9. This broke libsensors. Acked-by: Zhang Rui Acked-by: Jean Delvare Signed-off-by: Len Brown commit 3c00bb96497a9c1251359a1faf68dddbb8d50a23 Author: Laszlo Kajan Date: Tue Mar 18 00:39:55 2008 -0400 Input: ALPS - fix forward/back buttons reversed on Acer 5520-5290 ALPS_FW_BK_1 protocol flavor seems to have forward and backward keys reversed. Signed-off-by: Laszlo Kajan Signed-off-by: Dmitry Torokhov commit 1db3a3453f6915d6af322e3a1b25f7ab2c9d9a2b Author: Dmitry Torokhov Date: Tue Mar 18 00:29:18 2008 -0400 Input: ALPS - put secondary device in proper place in sysfs Secondary input device did not have parent set up causing it to appear in the root of sysfs device hierarchy. Signed-off-by: Dmitry Torokhov commit 0ac4a3c2fbbcadc3e96e4dc47d4ae802d66e6f67 Author: Len Brown Date: Tue Mar 18 00:26:07 2008 -0400 ACPI: fix ATA_ACPI build drivers/ata/libata-acpi.c fails to build drivers/built-in.o: In function `ata_acpi_associate': (.text+0x7106a): undefined reference to `register_hotplug_dock_device' When CONFIG_ATA_ACPI=y and CONFIG_ACPI_DOCK=m But if dock is selected from ata_acpi, dock will =y when ata_acpi=y, avoiding this problem. http://bugzilla.kernel.org/show_bug.cgi?id=10272 Signed-off-by: Len Brown commit b8a1bdb14940946fcf0438a6337b2a6c54294fb8 Author: Alexey Starikovskiy Date: Mon Mar 17 22:37:42 2008 -0400 ACPI: battery: Don't return -EFAIL on broken packages. Acer BIOS has a bug which is exposed when a dead battery is present. The package template that is used to describe battery status is over-written with sane values when the battery is live. But when the batter is dead, a bogus reference in the template is used. In this case, Linux returns a fault, when instead it should simply return that it doesn't know the missing value. http://bugzilla.kernel.org/show_bug.cgi?id=8573 http://bugzilla.kernel.org/show_bug.cgi?id=10202 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 9e5858244926f4fddf8ba38a6b4fa3fe68e93836 Author: Mark Lord Date: Mon Mar 17 16:04:23 2008 -0400 pciehp: don't enable slot unless forced This fixes a 2.6.25 regression reported by Alex Chiang. Invoke pciehp_enable_slot() at startup only when pciehp_force=1. Some HP equipment apparently cannot cope with it otherwise. This restores the (previously working) 2.6.24 behaviour here, while allowing machines that need a kick to use pciehp_force=1. This was the original design back in October 2007, but Kristen suggested we try without it first: Kristen Carlson Accardi wrote: >I think it would be ok to try allowing the slot to be enabled when not >using pciehp_force mode. We can wrap it later if it proves to break things This ended up breaking one of Alex's setups, so it's time to put the wrapper back in now. Signed-off-by: Mark Lord Acked-by: Alex Chiang Acked-by: Kristen Carlson Accardi Signed-off-by: Linus Torvalds commit 2e1479d95d02b43660fe03ab2c595ec9751a6f97 Author: Adrian Bunk Date: Mon Mar 17 22:29:23 2008 +0200 make selinux_parse_opts_str() static This patch makes the needlessly global selinux_parse_opts_str() static. Signed-off-by: Adrian Bunk Acked-by: Eric Paris Signed-off-by: James Morris commit 40044ce0bf2b7e548584d91f108444e83ed5eab3 Author: Jens Axboe Date: Mon Mar 17 21:14:40 2008 +0100 Revert "unexport bio_{,un}map_user" Outside users like asmlib uses the mapping functions. API wise, the export is definitely sane. It's a better idea to keep this export than to require external users to open-code this piece of code instead. Signed-off-by: Jens Axboe commit fc4d30a6fc88121081916faef930d8c3e4ed6036 Merge: 9150c97... 1682fe6... Author: David S. Miller Date: Mon Mar 17 12:06:33 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit caeab084deb61cd2d51cb8facc0e894a5b406aa4 Author: Christoph Lameter Date: Wed Mar 12 23:57:49 2008 -0700 slub page alloc fallback: Enable interrupts for GFP_WAIT. The fallback path needs to enable interrupts like done for the other page allocator calls. This was not necessary with the alternate fast path since we handled irq enable/disable in the slow path. The regular fastpath handles irq enable/disable around calls to the slow path so we need to restore the proper status before calling the page allocator from the slowpath. Signed-off-by: Christoph Lameter commit bde4f8fa8db2abd5ac9c542d76012d0fedab050f Merge: 8484138... c40e7cb... Author: Linus Torvalds Date: Mon Mar 17 09:52:24 2008 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: Add Marvell 6121 SATA support pata_ali: use atapi_cmd_type() to determine cmd type instead of transfer size ahci: implement skip_host_reset parameter ahci: request all PCI BARs devres: implement pcim_iomap_regions_request_all() libata-acpi: improve dock event handling commit 84841384ec6ec57544b76e564514d3f9eb6c1901 Merge: 3d10a15... 4265f16... Author: Linus Torvalds Date: Mon Mar 17 09:52:19 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: virtio: fix race in enable_cb virtio: Enable netpoll interface for netconsole logging virtio: handle > 2 billion page balloon targets virtio: Fix sysfs bits to have proper block symlink virtio: Use spin_lock_irqsave/restore for virtio-pci commit 3d10a15d6919488204bdb264050d156ced20d9aa Author: Al Viro Date: Sun Mar 16 22:48:08 2008 +0000 hfs_bnode_find() can fail, resulting in hfs_bnode_split() breakage oops and fs corruption; the latter can happen even on valid fs in case of oom. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c40e7cb89f9d36924131ef708ff1f16a76611add Author: Jose Alberto Reguero Date: Thu Mar 13 23:22:24 2008 +0100 ahci: Add Marvell 6121 SATA support Signed-off-by: Jose Alberto Reguero Signed-off-by: Jeff Garzik commit 4a38e733a75d52e84772fc00d88e32032a235e75 Author: Tejun Heo Date: Tue Mar 11 11:35:00 2008 +0900 pata_ali: use atapi_cmd_type() to determine cmd type instead of transfer size pata_ali was using qc->nbytes to determine whether a command is data transfer type or not. As now qc->nbytes can be extended by padding and draining buffers, these tests are not useful anymore. Use atapi_cmd_type() instead. Signed-off-by: Tejun Heo Cc: Alan Cox Cc: Rafael J. Wysocki Signed-off-by: Jeff Garzik commit a22e64443f0aa4aa4e3c56a49e5c060e90752c07 Author: Tejun Heo Date: Mon Mar 10 10:25:25 2008 +0900 ahci: implement skip_host_reset parameter Under certain circumstances (SSP turned off by the BIOS) and for debugging purposes, skipping global controller reset is helpful. Add a kernel parameter for it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit dea55137634226fd74d5187a15dee1244ec252cb Author: Tejun Heo Date: Tue Mar 11 19:52:31 2008 +0900 ahci: request all PCI BARs ahci is often implemented with accompanying SFF compatible interface and legacy IDE driver may attach to the legacy IO ports when the controller is already claimed by ahci and vice-versa. This patch makes ahci use pcim_iomap_regions_request_all() so that all IO regions are claimed on attach. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 916fbfb7ae5f8c8f86399794d89e6d273df8826b Author: Tejun Heo Date: Wed Mar 12 15:26:34 2008 +0900 devres: implement pcim_iomap_regions_request_all() Some drivers need to reserve all PCI BARs to prevent other drivers misusing unoccupied BARs. pcim_iomap_regions_request_all() requests all BARs and iomap specified BARs. Signed-off-by: Tejun Heo Cc: Greg Kroah-Hartman Cc: Alan Cox Cc: Jeff Garzik Signed-off-by: Jeff Garzik commit 233f112042d0b50170212dbff99c3b34b8773cd3 Author: Tejun Heo Date: Wed Mar 12 14:24:43 2008 +0900 libata-acpi: improve dock event handling Improve ACPI hotplug handling such that dock event is handled properly. * Register handlers for dock events. * Directly detach device on EJECT_REQUEST instead of signaling hotplug event. This prevents libata from accessing severed controller and/or device. * While at it, use named constants for ACPI events and move uevent signaling inside host lock. Original patch and testing by Holger Macht. Signed-off-by: Tejun Heo Cc: Holger Macht Signed-off-by: Jeff Garzik commit 9150c979cee012eeee853d4041e133d2801c699e Author: Harvey Harrison Date: Thu Mar 6 15:55:09 2008 +0000 ioc3.c: replace remaining __FUNCTION__ occurrences __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Signed-off-by: Ralf Baechle drivers/sn/ioc3.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) Signed-off-by: Jeff Garzik commit ffea31ed1c93a599d14de484a2c5c701f4480ba3 Author: Joakim Tjernlund Date: Thu Mar 6 18:48:46 2008 +0800 ucc_geth: use correct thread number for 10/100Mbps link Use thread number of 1 for 10/100Mbps link instead of 4. Signed-off-by: Joakim Tjernlund Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 44b0cda37534093fd9fefacd64d5fbb589c50795 Author: Mitch Williams Date: Fri Mar 7 10:32:13 2008 -0800 igb: Correctly get protocol information We can't look at the socket to get protocol information. We should instead look directly at the packet, and hope there are no IPv6 option headers. Signed-off-by: Mitch Williams Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 725e49c5daab0b011b80907ec21fa68f3ab78633 Author: Ralf Baechle Date: Sat Mar 8 16:58:33 2008 +0000 [IOC3] Fix section missmatch LD drivers/net/built-in.o WARNING: drivers/net/built-in.o(.text+0x3468): Section mismatch in reference fro m the function ioc3_probe() to the function .devinit.text:ioc3_serial_probe() The function ioc3_probe() references the function __devinit ioc3_serial_probe(). This is often because ioc3_probe lacks a __devinit annotation or the annotation of ioc3_serial_probe is wrong. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 69cac988f2d8506d0b479c5ae7903b9067d7641d Author: Grant Grundler Date: Sat Mar 8 18:33:16 2008 -0700 2.6.25-rc4 de_stop_rxtx polling wrong This untested patch _should_ fix: "(net de2104x) Kernel panic with de2104x tulip driver on boot" http://bugzilla.kernel.org/show_bug.cgi?id=3156 But the bug submitter isn't responding. Same fix has been applied to tulip.c (several years ago) and uli526x.c (Feb 2008) drivers. [ The panic reported in the bug report was removed in a recently (march 2008) accepted patch from Ondrej Zary. ] Signed-off-by: Grant Grundler Signed-off-by: Jeff Garzik commit 3b446c3e1592287dae117e03e61af0aa09adba6f Author: Ayaz Abdulla Date: Mon Mar 10 14:58:21 2008 -0500 forcedeth: limit tx to 16 This is a critical patch which adds a workaround for a HW bug. The patch will limit the number of outstanding tx packets to 16. Otherwise, the HW could send out packets with bad checksums. The driver will still setup the tx packets into the ring, however, will only set the Valid bit on 16 packets at a time. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit ad390d2d56c167b317a38b50f6373a4775597734 Author: Alan Cox Date: Mon Mar 10 21:57:20 2008 +0000 3c501: Further coding style fixes Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit cd7e903440bad2625afa4090f34bf497593656cd Author: Divy Le Ray Date: Thu Mar 13 00:13:30 2008 -0700 cxgb3: Fix transmit queue stop mechanism The last change in the Tx queue stop mechanism opens a window where the Tx queue might be stopped after pending credits returned. Tx credits are returned via a control message generated by the HW. It returns tx credits on demand, triggered by a completion bit set in selective transmit packet headers. The current code can lead to the Tx queue stopped with all pending credits returned, and the current frame not triggering a credit return. The Tx queue will then never be awaken. The driver could alternatively request a completion for packets that stop the queue. It's however safer at this point to go back to the pre-existing behaviour. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit cdb346977829885cbd8b1200ca21049b1df242ad Author: Stefan Roese Date: Thu Mar 13 16:59:43 2008 +0100 NEWEMAC: Add compatible "ibm,tah" to tah matching table Add "ibm,tah" to the compatible matching table of the ibm_newemac tah driver. The type "tah" is still preserved for compatibility reasons. New dts files should use the compatible property though. Signed-off-by: Stefan Roese Signed-off-by: Jeff Garzik commit 10d0f27c1baa4a094b4965708a15f2b0c4d65f5e Author: Jean-Christophe Dubois Date: Thu Mar 13 14:56:36 2008 -0800 rndis_host: fix transfer size negotiation This patch should resolve a problem that's troubled support for some RNDIS peripherals. It seems to have boiled down to using a variable to establish transfer size limits before it was assigned, which caused those devices to fallback to a default "jumbogram" mode we don't support. Fix by assigning it earlier for RNDIS. Signed-off-by: Jean-Christophe Dubois [ cleanups ] Signed-off-by: David Brownell Signed-off-by: Jeff Garzik commit 4373c9327f10c362f13d5b78557f93a471211a42 Author: Pravin M. Bathija Date: Fri Mar 14 10:52:28 2008 +0100 NEWEMAC: fix support for pause packets Problem Description and Fix --------------------------- When a pause packet(with destination as reserved Multicast address) is received by the EMAC hardware to control the flow of frames being transmitted by it, it is dropped by the hardware unless the reserved Multicast address is hashed in to the GAHT[1-4] registers. This code fix adds the default reserved multicast address to the GAHT[1-4] registers in the EMAC(s) present on the chip. The flow control with Pause packets will only work if the following register bits are programmed in EMAC: EMACx_MR1[APP] = 1 EMACx_RMR[BAE] = 1 EMACx_RMR[MAE] = 1 Behavior that may be observed in a running system ------------------------------------------------- A host transferring data from a PPC based system may send a Pause packet to the PPC EMAC requesting it to slow down the flow of packets. If the default reserved multicast MAC address is not programmed into the GAHT[1-4] registers this Pause packet will be dropped by PPC EMAC and no Flow Control will be done. Signed-off-by: Pravin M. Bathija Signed-off-by: Stefan Roese Signed-off-by: Jeff Garzik commit 4265f161b6bb7b31163671329b1142b9023bf4e3 Author: Christian Borntraeger Date: Fri Mar 14 14:17:05 2008 +0100 virtio: fix race in enable_cb There is a race in virtio_net, dealing with disabling/enabling the callback. I saw the following oops: kernel BUG at /space/kvm/drivers/virtio/virtio_ring.c:218! illegal operation: 0001 [#1] SMP Modules linked in: sunrpc dm_mod CPU: 2 Not tainted 2.6.25-rc1zlive-host-10623-gd358142-dirty #99 Process swapper (pid: 0, task: 000000000f85a610, ksp: 000000000f873c60) Krnl PSW : 0404300180000000 00000000002b81a6 (vring_disable_cb+0x16/0x20) R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:3 PM:0 EA:3 Krnl GPRS: 0000000000000001 0000000000000001 0000000010005800 0000000000000001 000000000f3a0900 000000000f85a610 0000000000000000 0000000000000000 0000000000000000 000000000f870000 0000000000000000 0000000000001237 000000000f3a0920 000000000010ff74 00000000002846f6 000000000fa0bcd8 Krnl Code: 00000000002b819a: a7110001 tmll %r1,1 00000000002b819e: a7840004 brc 8,2b81a6 00000000002b81a2: a7f40001 brc 15,2b81a4 >00000000002b81a6: a51b0001 oill %r1,1 00000000002b81aa: 40102000 sth %r1,0(%r2) 00000000002b81ae: 07fe bcr 15,%r14 00000000002b81b0: eb7ff0380024 stmg %r7,%r15,56(%r15) 00000000002b81b6: a7f13e00 tmll %r15,15872 Call Trace: ([<000000000fa0bcd0>] 0xfa0bcd0) [<00000000002b8350>] vring_interrupt+0x5c/0x6c [<000000000010ab08>] do_extint+0xb8/0xf0 [<0000000000110716>] ext_no_vtime+0x16/0x1a [<0000000000107e72>] cpu_idle+0x1c2/0x1e0 The problem can be triggered with a high amount of host->guest traffic. I think its the following race: poll says netif_rx_complete poll calls enable_cb enable_cb opens the interrupt mask a new packet comes, an interrupt is triggered----\ enable_cb sees that there is more work | enable_cb disables the interrupt | . V . interrupt is delivered . skb_recv_done does atomic napi test, ok some waiting disable_cb is called->check fails->bang! . poll would do napi check poll would do disable_cb The fix is to let enable_cb not disable the interrupt again, but expect the caller to do the cleanup if it returns false. In that case, the interrupt is only disabled, if the napi test_set_bit was successful. Signed-off-by: Christian Borntraeger Signed-off-by: Rusty Russell (cleaned up doco) commit da74e89d40995600b3b07ac500084920247687ce Author: Amit Shah Date: Fri Feb 29 16:24:50 2008 +0530 virtio: Enable netpoll interface for netconsole logging Add a new poll_controller handler that the netpoll interface needs. This enables netconsole logging from a kvm guest over the virtio net interface. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit bdc1681cdf1ab6a65fa935a2b3f8fc63b20c54ea Author: Rusty Russell Date: Mon Mar 17 22:58:15 2008 -0500 virtio: handle > 2 billion page balloon targets If the host asks for a huge target towards_target() can overflow, and we up oops as we try to release more pages than we have. The simple fix is to use a 64-bit value. Signed-off-by: Rusty Russell commit c483934670d31e064e18967bb679c1079b54ea72 Author: Jeremy Katz Date: Sun Mar 2 17:00:15 2008 -0500 virtio: Fix sysfs bits to have proper block symlink Fix up so that the virtio_blk devices in sysfs link correctly to their block device. This then allows them to be detected by hal, etc Signed-off-by: Jeremy Katz Signed-off-by: Rusty Russell commit 27ebe308af7c14aed0711e25817c6a1235bd16ff Author: Anthony Liguori Date: Sun Mar 2 16:37:48 2008 -0600 virtio: Use spin_lock_irqsave/restore for virtio-pci virtio-pci acquires its spin lock in an interrupt context so it's necessary to use spin_lock_irqsave/restore variants. This patch fixes guest SMP when using virtio devices in KVM. Signed-off-by: Anthony Liguori Signed-off-by: Rusty Russell commit 16bb547e130bad47c16852f353f5501cf4b9b35a Author: Julia Lawall Date: Sat Mar 15 17:05:02 2008 +0100 drivers/net/atl1/atl1_main.c: remove unused variable The variable update_rx is initialized but never used otherwise. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; identifier i; constant C; @@ ( extern T i; | - T i; <+... when != i - i = C; ...+> ) // Signed-off-by: Julia Lawall Acked-by: Jay Cliburn Signed-off-by: Jeff Garzik commit b97ef8757b6752397ed1dd24bfc9083cf4dc49b4 Author: Julia Lawall Date: Sat Mar 15 17:04:39 2008 +0100 drivers/net/ipg.c: remove unused variable The variable gig is initialized but never used otherwise. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; identifier i; constant C; @@ ( extern T i; | - T i; <+... when != i - i = C; ...+> ) // Signed-off-by: Julia Lawall Signed-off-by: Jeff Garzik commit 9ebfd4929dc86d33cb68823714802cf226a38d42 Author: Al Viro Date: Sun Mar 16 22:22:04 2008 +0000 epic100 endianness annotations and fixes * "powerpc or sparc" is not the same as "big-endian", fix the ifdef * since we tell the card to byteswap the descriptors on big-endian, we ought to leave them host-endian... Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 48f5fec5486286103c4423fc78fdf3a15530c3b9 Author: Al Viro Date: Sun Mar 16 22:22:14 2008 +0000 ipg fix spurious cpu_to_le64() Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 3b5e26f7b07f5e537cef705de79174025ecd383c Author: Al Viro Date: Sun Mar 16 22:22:34 2008 +0000 more misannotations: ne2k-pci Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 63734a32a401d79eb1ae54bf61374a54c05750c9 Author: Al Viro Date: Sun Mar 16 22:23:04 2008 +0000 fore2000 - fix misannotations Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 5ffa6d7f613ca0198dae235986443cd921fa2e75 Author: Al Viro Date: Sun Mar 16 22:22:44 2008 +0000 wan/farsync: copy_from_user() to iomem is wrong kmalloc intermediate buffer(), do copy_from_user() + memcpy_toio() Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit ed773b4ab1387a25b3be027d45c94daae3c8a607 Author: Al Viro Date: Sun Mar 16 22:43:06 2008 +0000 r6040 endianness fixes pci_unmap_single() on little-endian address Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 16d54669427069ef2823752c365d695b0cc4748f Author: Jens Axboe Date: Mon Mar 17 09:04:59 2008 +0100 relay: fix subbuf_splice_actor() adding too many pages If subbuf_pages was larger than the max number of pages the pipe buffer will hold, subbuf_splice_actor() would happily go beyond the array size. Signed-off-by: Jens Axboe commit 2af3e6017e53065ddf40bb19190a29199b7ffee3 Author: Adrian Bunk Date: Thu Mar 6 16:02:42 2008 +0100 The ps2esdi driver was marked as BROKEN more than two years ago due to being no longer working for some time. A driver that had been marked as BROKEN for such a long time seems to be unlikely to be revived in the forseeable future. But if anyone wants to ever revive this driver, the code is still present in the older kernel releases. Signed-off-by: Adrian Bunk Acked-by: Alan Cox Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit b05c23851ab820b1957cd2f322eaa1ac44c196bd Author: Dave Airlie Date: Mon Mar 17 10:24:24 2008 +1000 drm/ati_pcigart: fix the PCIGART to use drm_pci to allocate GART table. This fixes a problem on 64-bit with 4GB with ATI RS690 chipsets. It makes sure the pcigart table is allocated in coherent memory for DMA operations. Signed-off-by: Dave Airlie commit 16d3be46d9ffbc2c562b25d66d59666db2cf2cd5 Author: Alex Deucher Date: Mon Mar 17 10:22:12 2008 +1000 drm/radeon: fixup RV550 chip family This fixes up the RV550 chips which are based on RV515, not RV530. It also adds another RS690 PCI ID. Signed-off-by: Dave Airlie commit f0fb6d7798e7e2d1f37a2c15892910661bdaba55 Author: Thomas Hellstrom Date: Mon Mar 17 10:07:20 2008 +1000 drm/via: attempt again to stabilise the AGP DMA command submission. It's worth remembering that all new bright ideas on how to make this command reader work properly and according to docs will probably fail :( Bring in some old code. Also allow a larger SG-DMA download stride, and remove unnecessary waits for command regulators pauses. Signed-off-by: Dave Airlie commit 9df5808cca52f33e1deb52b5010c68c6ed1656fe Author: Mike Isely Date: Thu Mar 13 15:30:35 2008 -0500 drm: Fix race that can lockup the kernel The i915_vblank_swap() function schedules an automatic buffer swap upon receipt of the vertical sync interrupt. Such an operation is lengthy so it can't be allowed to happen in normal interrupt context, thus the DRM implements this by scheduling the work in a kernel softirq-scheduled tasklet. In order for the buffer swap to work safely, the DRM's central lock must be taken, via a call to drm_lock_take() located in drivers/char/drm/drm_irq.c within the function drm_locked_tasklet_func(). The lock-taking logic uses a non-interrupt-blocking spinlock to implement the manipulations needed to take the lock. This semantic would be safe if all attempts to use the spinlock only happen from process context. However this buffer swap happens from softirq context which is really a form of interrupt context. Thus we have an unsafe situation, in that drm_locked_tasklet_func() can block on a spinlock already taken by a thread in process context which will never get scheduled again because of the blocked softirq tasklet. This wedges the kernel hard. To trigger this bug, run a dual-head cloned mode configuration which uses the i915 drm, then execute an opengl application which synchronizes buffer swaps against the vertical sync interrupt. In my testing, a lockup always results after running anywhere from 5 minutes to an hour and a half. I believe dual-head is needed to really trigger the problem because then the vertical sync interrupt handling is no longer predictable (due to being interrupt-sourced from two different heads running at different speeds). This raises the probability of the tasklet trying to run while the userspace DRI is doing things to the GPU (and manipulating the DRM lock). The fix is to change the relevant spinlock semantics to be the interrupt-blocking form. After this change I am no longer able to trigger the lockup; the longest test run so far was 20 hours (test stopped after that point). Note: I have examined the places where this spinlock is being employed; all are reasonably short bounded sequences and should be suitable for interrupts being blocked without impacting overall kernel interrupt response latency. Signed-off-by: Mike Isely Signed-off-by: Dave Airlie commit 1b96f8955aaeeb05f7fb7ff548aa12415fbf3904 Author: Sven Schnelle Date: Mon Mar 10 22:50:04 2008 +0100 [SCSI] gdth: Allocate sense_buffer to prevent NULL pointer dereference Fix NULL pointer dereference during execution of Internal commands, where gdth only allocates scp, but not scp->sense_buffer. The rest of the code assumes that sense_buffer is allocated, which leads to a kernel oops e.g. on reboot (during cache flush). Signed-off-by: Sven Schnelle Signed-off-by: James Bottomley commit 8b1327f6ed957030a64ccdb17131955bfea2d3fe Author: Steve French Date: Fri Mar 14 22:37:16 2008 +0000 [CIFS] file create with acl support enabled is slow Shirish Pargaonkar noted: With cifsacl mount option, when a file is created on the Windows server, exclusive oplock is broken right away because the get cifs acl code again opens the file to obtain security descriptor. The client does not have the newly created file handle or inode in any of its lists yet so it does not respond to oplock break and server waits for its duration and then responds to the second open. This slows down file creation signficantly. The fix is to pass the file descriptor to the get cifsacl code wherever available so that get cifs acl code does not send second open (NT Create ANDX) and oplock is not broken. CC: Shirish Pargaonkar Signed-off-by: Steve French commit 4d3995b14ba7abcdd475d17b8751db55d8a95b9e Author: nickcheng Date: Tue Mar 4 17:49:59 2008 +0800 [SCSI] arcmsr: fix iounmap error for Type B adapter The Type B Adapter teardown does iounmap on pointers subtracted by a constant offset. Since the offset is in bytes, we need the pointers to be of type void * not uint32_t * so the subtraction is done in the correct units and we iounmap the correct area. Signed-off-by: Nick Cheng Signed-off-by: James Bottomley commit ebe8912be214662c8289977fb416c1f015df4a0b Merge: 5053144... dba92d3... Author: Steve French Date: Fri Mar 14 19:29:18 2008 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 50531444fac593c8c8e3ff2e41944d9507bb4665 Author: Steve French Date: Fri Mar 14 19:21:31 2008 +0000 [CIFS] Fix mtime on cp -p when file data cached but written out too late Kukks noticed that cp -p can write out file data too late, after the timestamp is already set. This was introduced as an unintentional sideeffect of the change in an earlier patch (see below) which fixed some delayed return code propagation. cea218054ad277d6c126890213afde07b4eb1602 Author: Jeff Layton Date: Tue Nov 20 23:19:03 2007 +0000 Acked-by: Shirish Pargaonkar Acked-by: Jeff Layton Signed-off-by: Steve French commit 0e1763f530af71bd82e58e407991a9ded6aae73e Author: Ping Cheng Date: Thu Mar 13 16:46:46 2008 -0400 Input: wacom - add support for Bamboo1, BambooFun, and Cintiq 12WX Add support for new wacom tablets - Bamboo1, BambooFun, and Cintiq 12WX Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 75d08c78931aa3992791cc4a5615ed1dd61eea92 Author: Jiri Kosina Date: Thu Mar 13 16:13:59 2008 -0400 Input: document i8042.noloop Document 'noloop' kernel parameter of i8042 controller driver. Pointed out in #10236. Signed-off-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit e32f7ee876ebbdec73e4c19dce559a20c2ab840e Author: Samuel Thibault Date: Mon Mar 10 03:08:45 2008 -0700 Input: add keyboard notifier documentation Document the keyboard notifier. Signed-off-by: Samuel Thibault Signed-off-by: Andrew Morton Signed-off-by: Jiri Kosina SIgned-off-by: Dmitry Torokhov commit 05be5fc4c75fd91c9601b5e697f94112f0f6482b Author: Andrew Morton Date: Mon Mar 10 03:08:40 2008 -0700 Input: ads7846 - fix uninitialized var warning drivers/input/touchscreen/ads7846.c: In function 'ads7846_read12_ser': drivers/input/touchscreen/ads7846.c:216: warning: 'sample' may be used uninitialized in this function Signed-off-by: Andrew Morton Signed-off-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit f1782447125c167ca02babb9a2af3853895e411c Author: Thomas Bogendoerfer Date: Wed Mar 12 14:58:16 2008 -0400 Input: i8042 - add SNI RM support SNI RM200 don't have the i8042 controller connected to the EISA bus, but have a second address range for onboard devices. This patch handles the two possible address ranges for the i8042 on SNI RMs. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Dmitry Torokhov commit 2a2dcd65e232eafd9fb6da1250f83adb57787b42 Author: Jiri Kosina Date: Mon Mar 10 03:08:54 2008 -0700 Input: i8042 - add Lenovo 3000 N100 to nomux blacklist Lenovo 3000 N100 needs entry in nomux blacklist. Reported-by: Christopher Desjardins Signed-off-by: Andrew Morton Signed-off-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit d38501a379b7827a9bf916ba79d53f66c4ca7caa Author: Roland Dreier Date: Mon Mar 10 03:08:43 2008 -0700 Input: i8042 - fix warning on non-x86 builds Commit c18bab80 ("Input: i8042 - non-x86 build fix") introduced the following warning on non-x86 builds: drivers/input/serio/i8042.c: In function 'i8042_probe': drivers/input/serio/i8042.c:1154: warning: unused variable 'param' Fix this by moving the parameter variable declaration into the #ifdef too. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit 3c514387bd24c41a0cbb434f59e4727e5829cc8e Author: Yoichi Yuasa Date: Fri Mar 14 11:52:37 2008 -0400 Input: cobalt_btns - assorted fixes - fix compile errors (keymap is in bdev, not pdev) - cdev is no more (must use dev.parent) - update copiright notice Signed-off-by: Yoichi Yuasa Signed-off-by: Dmitry Torokhov commit 6dba1b67601685ff00ef5d08cc4f11db00cff598 Author: Paul Mundt Date: Fri Mar 14 17:21:09 2008 +0900 sh: Fix more user header breakage from sh64 integration. posix_types.h and byteorder.h were sticking purely with the Kconfig symbols, which doesn't work when we scrub the headers for user use. Fixes a very unhelpful build error in current klibc. Signed-off-by: Paul Mundt commit 66b5bf4216631628788bc48b028c203e8538f43e Author: Paul Mundt Date: Fri Mar 14 17:19:38 2008 +0900 sh: Fix uImage build error. The printf string was broken in the same way the zImage one was before, though the uImage managed to avoid getting fixed at that time. Do so now. Signed-off-by: Paul Mundt commit 71e93d15612c61c2e26a169567becf088e71b8ff Author: Venki Pallipadi Date: Thu Mar 13 17:18:19 2008 -0700 ACPI: lockdep warning on boot, 2.6.25-rc5 This avoids the harmless WARNING by lockdep in acpi_processor_idle(). The reason for WARNING is because at the depth of idle handling code, some of the idle handlers disable interrupts, some times, while returning from the idle handler. After return, acpi_processor_idle and few other routines in the file did an unconditional local_irq_enable(). With LOCKDEP, enabling irq when it is already enabled generates the below WARNING. > > [ 0.593038] ------------[ cut here ]------------ > > [ 0.593267] WARNING: at kernel/lockdep.c:2035 trace_hardirqs_on+0xa0/0x115() > > [ 0.593596] Modules linked in: > > [ 0.593756] Pid: 0, comm: swapper Not tainted 2.6.25-rc5 #8 > > [ 0.594017] > > [ 0.594017] Call Trace: > > [ 0.594216] [] warn_on_slowpath+0x58/0x6b > > [ 0.594495] [] ? _spin_unlock_irqrestore+0x38/0x47 > > [ 0.594809] [] ? acpi_os_release_lock+0x9/0xb > > [ 0.595103] [] ? acpi_set_register+0x161/0x173 > > [ 0.595401] [] ? acpi_processor_idle+0x1de/0x546 > > [ 0.595706] [] ? default_idle+0x0/0x73 > > [ 0.595970] [] trace_hardirqs_on+0xa0/0x115 > > [ 0.596049] [] ? acpi_processor_idle+0x0/0x546 > > [ 0.596346] [] acpi_processor_idle+0x1de/0x546 > > [ 0.596642] [] ? default_idle+0x0/0x73 > > [ 0.596912] [] ? acpi_processor_idle+0x0/0x546 > > [ 0.597209] [] ? default_idle+0x0/0x73 > > [ 0.597472] [] cpu_idle+0xa7/0xd1 > > [ 0.597717] [] rest_init+0x55/0x57 > > [ 0.597957] [] start_kernel+0x29d/0x2a8 > > [ 0.598215] [] _sinittext+0x1da/0x1e1 > > [ 0.598464] > > [ 0.598546] ---[ end trace 778e504de7e3b1e3 ]--- Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit e92e63aabacf049fd64477e5e29eae0375d8d064 Author: Boaz Harrosh Date: Wed Mar 12 19:20:09 2008 +0200 [SCSI] isd200: Allocate sense_buffer for hacked up scsi_cmnd Since the separation of sense_buffer from scsi_cmnd, Drivers that hack their own struct scsi_cmnd like here isd200, must also take care of their own sense_buffer. Signed-off-by: Boaz Harrosh Signed-off-by: James Bottomley commit 4b6f5b3a993cbe34b4280f252bccc76967c185c8 Author: Mike Christie Date: Tue Mar 11 00:36:51 2008 -0500 [SCSI] fix bsg queue oops with iscsi logout Delay bsg unregistration, because we want to wait until all the request/cmds have released their reference. Signed-off-by: Mike Christie Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 1682fe6de206bd1e937529cbb393915e5ea40b2c Author: Ivo van Doorn Date: Thu Mar 13 15:38:03 2008 +0100 rt2x00: Add suspend/resume handlers to rt2x00rfkill Add suspend/resume handlers to rt2x00rfkill to have it stop the input-polldev and prevent it from calling rt2x00 during suspend period. This could lead to a NULL pointer fault when rt2x00 suspended, but polldev send a request, because the csr_addr is NULL. Also don't let the rfkill allocation/registration block the initialization of the entire device. Just print a warning and continue as if nothing happened. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f50e4a8494a74bdbc0f86f1430a4cca2a4f28799 Author: Pavel Roskin Date: Wed Mar 12 16:13:31 2008 -0400 ath5k: disable irq handling in ath5k_hw_detach() Once ah has been freed, it may not be accessed. Set ATH_STAT_INVALID bit to make the interrupt handler return IRQ_NONE without accessing ah. This fixes oops on unload with CONFIG_DEBUG_SHIRQ enabled. Signed-off-by: Pavel Roskin Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 5abdc49d6e521126ed4c15e913a5c30f6dd95e6b Author: Harvey Harrison Date: Wed Mar 12 17:51:04 2008 +0100 b43: phy.c fix typo in register write Commit 61bca6eb85c863603d6054530e2f65c3b9aba85b b43: rewrite A PHY initialization has a typo, the result of the register read should be masked, not the register offset. Signed-off-by: Harvey Harrison Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit c1e889be18aff97e20853231531b79d79a984369 Author: Masakazu Mokuno Date: Wed Mar 12 16:41:11 2008 +0900 PS3: gelic: change the prefix of the net interface for wireless The gelic driver uses two net interfaces, one for ethernet and the other for wireless. They share same MAC address and use 'eth' prefix for the name. As udev uses the MAC address to check uniqueness, this is somewhat problematic. So change the prefix of the network interface name for the wireless so that udev can have an easy way to distinguish interfaces. Signed-off-by: Masakazu Mokuno Signed-off-by: John W. Linville commit aad4c7d3a641315519add159a80f73cce554e7cd Author: Masakazu Mokuno Date: Tue Mar 11 13:15:44 2008 +0900 PS3: gelic: ignore scan info from zero SSID beacons Some implementations of the hidden SSID APs emit beacons which have the zero length SSID information element instead of SSID padded by null (\0) characters. If the firmware of the PS3 wireless hardware meets these beacons, it abandons parsing IEs. Thus guest OSes get the invalid scan information for the AP. To work around this, ignore these scan informations from the list. Signed-off-by: Masakazu Mokuno Signed-off-by: John W. Linville commit 43557e15c22701f0b94e5f14a874fe02e814574e Author: Jan Slupski Date: Mon Mar 10 22:41:18 2008 -0700 prism54: support for 124a:4025 - another version of IOGear GWU513 802.11g Add support to p54usb driver for apparently another version of IOGear GWU513 802.11g USB network card that uses GW3887IK chipset and is recognized as "124a:4025 AirVast" by lsusb. Cc: Michael Wu Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 2b2d4e70031d910f3ddf4d5d2b8be6724f871549 Author: Paul Mundt Date: Thu Mar 13 19:51:06 2008 +0900 sh: Fix up the timer IRQ definition for SH7203. Signed-off-by: Paul Mundt commit 6c0602b8dd4b41c078b52ed8ea97023970781744 Author: Kieran Bingham Date: Thu Mar 13 19:43:07 2008 +0900 sh: Fix up the address error exception handler for SH-2. Presently the SH-2/SH-2A address error exception dispatch copies off the register state from the stack and skips over the first register, skewing the rest. Fix up the math here so that the proper register state is handed down to the exception handler itself. Signed-off-by: Kieran Bingham Signed-off-by: Paul Mundt commit bc5b6e24a17f90c7d096d857650f4739cc95c941 Author: Steve French Date: Tue Mar 11 21:07:48 2008 +0000 [CIFS] Fix build problem Signed-off-by: Steve French commit 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 Merge: 55f78e1... baadac8... Author: Steve French Date: Tue Mar 11 19:15:41 2008 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 commit cae167d3d7f22a6a54ba47e7c3623b4c45a01e2b Author: Yutaro Ebihara Date: Tue Mar 11 13:58:50 2008 +0900 serial: sh-sci: Fix fifo stall on SH7760/SH7780/SH7785 SCIF. There was an off-by-1 in the SCRFDR calculation that caused writes over 128-bytes to hang in the FIFO. Fix it up. Signed-off-by: Yutaro Ebihara Signed-off-by: Paul Mundt commit 55f78e1771f0886162edd441dd4f39c287779de2 Author: Harvey Harrison Date: Mon Mar 10 17:14:34 2008 +0000 [CIFS] cifs: replace remaining __FUNCTION__ occurrences __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Signed-off-by: Steve French commit 7962670e648a0431338a7ce73847c24bc023d095 Author: Igor Mammedov Date: Sun Mar 9 03:44:18 2008 +0000 [CIFS] DFS patch that connects inode with dfs handling ops if DFS junction point Signed-off-by: Igor Mammedov Signed-off-by: Steve French commit 67951f63807328b81e45c3c87af049c55c0a0081 Author: James Bottomley Date: Thu Mar 6 15:32:06 2008 -0600 [SCSI] Fix dependency problems in SCSI drivers We have several drivers that don't list SCSI as a dependency in Kconfig. That leads to them potentially being selected as Y even if SCSI is M (which will produce a build failure). Fix this by making the if SCSI_LOWLEVEL that goes around all the drivers a tristate forcing them all automatically to inherit the value of SCSI. Signed-off-by: James Bottomley commit 951b62c11e86acf8c55d9828aa8c921575023c29 Author: Matthew Wilcox Date: Fri Oct 5 15:57:06 2007 -0400 [SCSI] advansys: Fix bug in AdvLoadMicrocode buf[i] can be up to 0xfd, so doubling it and assigning the result to an unsigned char truncates the value. Just use an unsigned int instead; it's only a temporary. Signed-off-by: Matthew Wilcox Cc: Stable Tree Signed-off-by: James Bottomley