commit afa153fd7b6afcd55dd6df6aea06bb53aa1d3608 Merge: ba6271e... 5a61dd9... Author: Linus Torvalds Date: Tue Sep 2 11:44:11 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: ide/Kconfig: mark ide-scsi as deprecated ide-disk: remove stale init_idedisk_capacity() documentation palm_bk3710: improve IDE registration ide: fix hwif_to_node() IDE: palm_bk3710: fix compile warning for unused variable IDE: compile fix for sff_dma_ops commit 5a61dd9ec8c5a8e14fbccda3ab042555b692b9b2 Author: Bartlomiej Zolnierkiewicz Date: Tue Sep 2 20:18:48 2008 +0200 ide/Kconfig: mark ide-scsi as deprecated Mark ide-scsi as deprecated and remove stale/bogus documentation. Signed-off-by: Bartlomiej Zolnierkiewicz commit ab1b67a6230648cf65b0342d9887fee890160ca8 Author: Bartlomiej Zolnierkiewicz Date: Tue Sep 2 20:18:47 2008 +0200 ide-disk: remove stale init_idedisk_capacity() documentation Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit bfc2f01fc83f982344f09f491f7c18a6b9a16aa8 Author: David Brownell Date: Tue Sep 2 20:18:47 2008 +0200 palm_bk3710: improve IDE registration * fix device tree ... don't forget to set the parent device * let init/exit code be removed where practical Signed-off-by: David Brownell [bart: splitted it from bigger DaVinci patch, s/hw.parent/hw.dev/] Signed-off-by: Bartlomiej Zolnierkiewicz commit 96f80219b738f84f90e449385bdede90f2910521 Author: Bartlomiej Zolnierkiewicz Date: Tue Sep 2 20:18:47 2008 +0200 ide: fix hwif_to_node() hwif_to_node() incorrectly assumes that hwif->dev always belongs to a PCI device. This results in ide-cs oopsing in init_irq() after commit c56c5648a3bd15ff14c50f284b261140cd5b5472 accidentally fixed device tree registration for ide-cs. Fix it by using dev_to_node(). Thanks to Martin Michlmayr and Larry Finger for help with debugging the issue. Reported-by: Martin Michlmayr Tested-by: Martin Michlmayr Cc: Larry Finger Cc: Dominik Brodowski Signed-off-by: Bartlomiej Zolnierkiewicz commit a1aee8622293138867e7dbd1dd214dfb34cd89d2 Author: Kevin Hilman Date: Tue Sep 2 20:18:47 2008 +0200 IDE: palm_bk3710: fix compile warning for unused variable Signed-off-by: Kevin Hilman Signed-off-by: Bartlomiej Zolnierkiewicz commit 71fc9fcc70e6ad96215510c1dbcbade05cd95e41 Author: Kevin Hilman Date: Tue Sep 2 20:18:46 2008 +0200 IDE: compile fix for sff_dma_ops The sff_dma_ops struct should be wrapped by BLK_DEV_IDEDMA_SFF instead of BLK_DEV_IDEDMA_PCI. Signed-off-by: Kevin Hilman Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit ba6271ea6324decab4c47c4a55de95188d930792 Merge: 99039e1... ee979a1... Author: Linus Torvalds Date: Tue Sep 2 11:05:42 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Add mic-boost controls to ALC662/663 auto configuration ALSA: hda - Fix ALC663 auto-probe ALSA: ASoC: fix pxa2xx-i2s clk_get call ALSA: hda: Distortion fix for dell_m6_core_init commit 99039e1352fa451bd46e2c020dc78bcaf2a159d9 Merge: 72a8d12... c4bacef... Author: Linus Torvalds Date: Tue Sep 2 11:04:47 2008 -0700 Merge branch 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] audit: Moved variable declaration to beginning of function commit 72a8d129cf5811b77f0d6c8acef9ac34a12bccf4 Merge: 7ed77e8... b2d2c4c... Author: Linus Torvalds Date: Tue Sep 2 11:04:09 2008 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: Fix problem with waiting while holding rcu read lock in md/bitmap.c Remove invalidate_partition call from do_md_stop. commit 7ed77e804650b9095f862a0cfeecaa955224a73e Author: Arjan van de Ven Date: Mon Sep 1 15:09:51 2008 -0700 don't diff generated firmware files With the new firmware infrastructure in 2.6.27, some files are generated and shouldn't be diffed; add these 2 to the "dontdiff" file Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 3df8a905ed09341041a3d1c6309fdb18cc809297 Author: Dennis Jansen Date: Fri Aug 15 01:28:57 2008 +0200 ACPI: Fix typo in "Disable MWAIT via DMI on broken Compal board" This fixes a typo in commit 2a2a64714d9c40f7705c4de1e79a5b855c7211a9 "Disable MWAIT via DMI on broken Compal board". It allows the nomwait dmi check to actually detect the Acer 5220. Signed-off-by: Dennis Jansen Tested-by: Dennis Jansen Acked-by: Zhao Yakui Signed-off-by: Linus Torvalds commit 919fae1686881ed3922ea9de5b0c0a4feff3069e Merge: e77295d... b67c5f8... Author: Linus Torvalds Date: Tue Sep 2 10:59:27 2008 -0700 Merge git://git.infradead.org/users/dwmw2/random-2.6 * git://git.infradead.org/users/dwmw2/random-2.6: [MTD] mtdchar.c: Fix regression in MEMGETREGIONINFO ioctl() dabusb_fpga_download(): fix a memory leak Remove '#include ' from mm/page_isolation.c Fix modules_install on RO nfs-exported trees. commit e77295dc9e6b52281ae85af4068f13752524e9f4 Merge: 1136cf1... 91b8096... Author: Linus Torvalds Date: Tue Sep 2 10:58:11 2008 -0700 Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux * 'for-2.6.27' of git://linux-nfs.org/~bfields/linux: nfsd: fix buffer overrun decoding NFSv4 acl sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports nfsd: fix compound state allocation error handling svcrdma: Fix race between svc_rdma_recvfrom thread and the dto_tasklet commit 1136cf11066a32d4ac2a476dac302858d763703d Author: Michael Schmitz Date: Mon Sep 1 20:27:02 2008 +0200 m68k: atari_keyb_init operator precedence fix Fix operator precedence bug in atari_keyb_init, which caused a failure on CT60 Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 2ecbf813d5e6361eb7c7520a6f5e6afa168df39a Author: Stephen Rothwell Date: Tue Sep 2 03:43:27 2008 +1000 fix typo in arch/parisc/hpux/fs.c A parisc allmodconfig build produces this: arch/parisc/hpux/fs.c:107: error: 'buffer' undeclared (first use in this function) Introduced by commit da574983de9f9283ba35662c8723627096e160de ("[PATCH] fix hpux_getdents()"). Helge Dille also reported this in bugzilla 11461: http://bugzilla.kernel.org/show_bug.cgi?id=11461 and he posted an identical patch. Signed-off-by: Stephen Rothwell Signed-off-by: Helge Deller Signed-off-by: Linus Torvalds commit cbaed698f37494b30b2449b51c728ae48630cb2b Author: Oleg Nesterov Date: Sat Aug 30 21:08:40 2008 +0400 softlockup: minor cleanup, don't check task->state twice The recent commit 16d9679f33caf7e683471647d1472bfe133d858 changed check_hung_task() to filter out the TASK_KILLABLE tasks. We can move this check to the caller which has to test t->state anyway. Signed-off-by: Oleg Nesterov Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6781f4ae30bbb8ebf31187b3c9304be16966f5a0 Author: Randy Dunlap Date: Sun Aug 31 20:31:55 2008 -0700 kernel/resource.c: fix new kernel-doc warning Fix kernel-doc warning for new function: Warning(linux-2.6.27-rc5-git2//kernel/resource.c:448): No description found for parameter 'root' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 6b9886a173ff6c9ed528979c4d0a3566c1f61013 Merge: 6ffbb19... 6c7be29... Author: Linus Torvalds Date: Tue Sep 2 10:46:56 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/radeon: downgrade debug message from info to debug. commit 6ffbb1964afe1236951f7ac30aa0ed202673e374 Merge: 1586553... c76da9d... Author: Linus Torvalds Date: Tue Sep 2 10:45:59 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] Turn off Unicode during session establishment for plaintext authentication [CIFS] update cifs change log cifs: fix O_APPEND on directio mounts [CIFS] Fix plaintext authentication commit 1586553bc840e17c321f244fc264ea8312678faf Merge: 44e7ed3... ddef43a... Author: Linus Torvalds Date: Tue Sep 2 10:45:01 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: block: restore original behavior of /proc/partition when there's no partition remove blk_register_filter and blk_unregister_filter in gendisk commit 44e7ed396114a0c43bb2494877aceeb7782e084a Merge: 011fec7... dbb8c35... Author: Linus Torvalds Date: Tue Sep 2 10:43:38 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: setup_valid_addr_bitmap_from_pavail() should be __init sparc: Fix resource flags for PCI children in OF device tree. sparc32: Implement smp_call_function_single(). commit 011fec7486028977e2b4012afb84235759c6ad82 Author: Linus Torvalds Date: Tue Sep 2 10:38:28 2008 -0700 Un-break printk strings in x86 PCI probing code Breaking lines due to some imaginary problem with a long line length is often stupid and wrong, but never more so when it splits a string that is printed out into multiple lines. This really ended up making it much harder to find where some error strings were printed out, because a simple 'grep' didn't work. I'm sure there is tons more of this particular idiocy hiding in other places, but this particular case hit me once more last week. So fix it. Signed-off-by: Linus Torvalds commit ee979a143cfd999adea8a9e272649a3cd9ec84bc Author: Takashi Iwai Date: Tue Sep 2 15:42:20 2008 +0200 ALSA: hda - Add mic-boost controls to ALC662/663 auto configuration Signed-off-by: Takashi Iwai commit 24fb9173815045ab3f85a670d7df8af5af6ff3be Author: Takashi Iwai Date: Tue Sep 2 14:48:20 2008 +0200 ALSA: hda - Fix ALC663 auto-probe Fix the wrong DAC assignment for NID 0x17 mono-pin on ALC663. Signed-off-by: Takashi Iwai commit b67c5f87c13f398ec3f4d6b455cb0bbeda8d7ac0 Author: Zev Weiss Date: Mon Sep 1 05:02:12 2008 -0700 [MTD] mtdchar.c: Fix regression in MEMGETREGIONINFO ioctl() The MEMGETREGIONINFO ioctl() in mtdchar.c was clobbering user memory by overwriting more than intended, due the size of struct mtd_erase_region_info changing in commit 0ecbc81adfcb9f15f86b05ff576b342ce81bbef8 ('Support for auto locking flash on power up'). Fix avoids this by copying struct members one by one with put_user(), as there is no longer a convenient struct to use the size of as the length argument to copy_to_user(). Signed-off-by: Zev Weiss Signed-off-by: David Woodhouse commit 02c0267a40c876a4d70f2000f21fe9ff89fb988e Author: Adrian Bunk Date: Thu Aug 28 01:04:30 2008 +0300 dabusb_fpga_download(): fix a memory leak This patch fixes a memory leak in an error path. Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: David Woodhouse commit 0ed97ee470c36e05bcaad36c4fb4c501f383ce63 Author: David Woodhouse Date: Mon Sep 1 11:10:28 2008 +0100 Remove '#include ' from mm/page_isolation.c Signed-off-by: David Woodhouse commit 1cede1affb3cc5a9520fdbc75b3fbaa6432cbc5a Author: David Woodhouse Date: Mon Sep 1 10:54:46 2008 +0100 Fix modules_install on RO nfs-exported trees. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=11355 by avoiding a needless rebuild of the firmware/ihex2fw tool. Signed-off-by: David Woodhouse commit c4bacefb7aaf49da11a695f29d85d40909f17693 Author: Cordelia Date: Mon Aug 18 09:45:51 2008 -0700 [PATCH] audit: Moved variable declaration to beginning of function got rid of compilation warning: ISO C90 forbids mixed declarations and code Signed-off-by: Cordelia Sam Signed-off-by: Al Viro commit 91b80969ba466ba4b915a4a1d03add8c297add3f Author: J. Bruce Fields Date: Fri Aug 29 19:18:45 2008 -0400 nfsd: fix buffer overrun decoding NFSv4 acl The array we kmalloc() here is not large enough. Thanks to Johann Dahm and David Richter for bug report and testing. Signed-off-by: J. Bruce Fields Cc: David Richter Tested-by: Johann Dahm commit 27df6f25ff218072e0e879a96beeb398a79cdbc8 Author: Cyrill Gorcunov Date: Sun Aug 31 19:25:49 2008 +0400 sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports Vegard Nossum reported ---------------------- > I noticed that something weird is going on with /proc/sys/sunrpc/transports. > This file is generated in net/sunrpc/sysctl.c, function proc_do_xprt(). When > I "cat" this file, I get the expected output: > $ cat /proc/sys/sunrpc/transports > tcp 1048576 > udp 32768 > But I think that it does not check the length of the buffer supplied by > userspace to read(). With my original program, I found that the stack was > being overwritten by the characters above, even when the length given to > read() was just 1. David Wagner added (among other things) that copy_to_user could be probably used here. Ingo Oeser suggested to use simple_read_from_buffer() here. The conclusion is that proc_do_xprt doesn't check for userside buffer size indeed so fix this by using Ingo's suggestion. Reported-by: Vegard Nossum Signed-off-by: Cyrill Gorcunov CC: Ingo Oeser Cc: Neil Brown Cc: Chuck Lever Cc: Greg Banks Cc: Tom Tucker Signed-off-by: J. Bruce Fields commit c228c24bf1138d4757dbe20615df655815446da3 Author: Andy Adamson Date: Thu Aug 21 08:42:16 2008 -0400 nfsd: fix compound state allocation error handling Move the cstate_alloc call so that if it fails, the response is setup to encode the NFS error. The out label now means that the nfsd4_compound_state has not been allocated. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields commit ddef43a843f620c6742a06633739887a901ec06b Author: Tejun Heo Date: Mon Sep 1 08:55:10 2008 +0200 block: restore original behavior of /proc/partition when there's no partition /proc/partitions didn't use to write out the header if there was no partition. However, recent commit 66c64afe changed the behavior. This is nothing major but there's no reason to change user visible behavior without a good rationale. Restore the original behavior. Note that 2.6.28 has clean up changes scheduled which will replace this rather hacky implementation. Signed-off-by: Tejun Heo Cc: Greg KH Cc: Kay Sievers Signed-off-by: Jens Axboe commit 6e5ea7015c62b672020ee0a7c2764942fe63fa25 Author: Dmitry Baryshkov Date: Sun Aug 31 00:45:02 2008 +0400 ALSA: ASoC: fix pxa2xx-i2s clk_get call pxa2xx-i2s: probe actual device and use it for clk_get call thus fixing error during startup hook Signed-off-by: Dmitry Baryshkov Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit 20f5f95ded9cdab62c26efb146967a75e12533ec Author: Matthew Ranostay Date: Mon Sep 1 08:17:56 2008 +0200 ALSA: hda: Distortion fix for dell_m6_core_init Added the EQ distortion fix to the dell_m6_core_init. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai commit b2d2c4ceaddc3098f19637a732f74b820a81a9e7 Author: NeilBrown Date: Mon Sep 1 12:48:13 2008 +1000 Fix problem with waiting while holding rcu read lock in md/bitmap.c A recent patch to protect the rdev list with rcu locking leaves us with a problem because we can sleep on memalloc while holding the rcu lock. The rcu lock is only needed while walking the linked list as uninteresting devices (failed or spares) can be removed at any time. So only take the rcu lock while actually walking the linked list. Take a refcount on the rdev during the time when we drop the lock and do the memalloc to start IO. When we return to the locked code, all the interesting devices on the list will not have moved, so we can simply use list_for_each_continue_rcu to pick up where we left off. Signed-off-by: NeilBrown commit 271f5a9b8f8ae0db95de72779d115c9d0b9d3cc5 Author: NeilBrown Date: Mon Sep 1 12:32:52 2008 +1000 Remove invalidate_partition call from do_md_stop. When stopping an md array, or just switching to read-only, we currently call invalidate_partition while holding the mddev lock. The main reason for this is probably to ensure all dirty buffers are flushed (invalidate_partition calls fsync_bdev). However if any dirty buffers are found, it will almost certainly cause a deadlock as starting writeout will require an update to the superblock, and performing that updates requires taking the mddev lock - which is already held. This deadlock can be demonstrated by running "reboot -f -n" with a root filesystem on md/raid, and some dirty buffers in memory. All other calls to stop an array should already happen after a flush. The normal sequence is to stop using the array (e.g. umount) which will cause __blkdev_put to call sync_blockdev. Then open the array and issue the STOP_ARRAY ioctl while the buffers are all still clean. So this invalidate_partition is normally a no-op, except for one case where it will cause a deadlock. So remove it. This patch possibly addresses the regression recored in http://bugzilla.kernel.org/show_bug.cgi?id=11460 and http://bugzilla.kernel.org/show_bug.cgi?id=11452 though it isn't yet clear how it ever worked. Signed-off-by: NeilBrown commit 6c7be29810dd85b4fe75588ec536446c1579d492 Author: Dave Airlie Date: Mon Sep 1 08:51:52 2008 +1000 drm/radeon: downgrade debug message from info to debug. If this triggers its bad, however some machines seem to have been triggering it for ages and we didn't know until we added the debug. So downgrade the debug now so people don't call this a regression. Signed-off-by: Dave Airlie commit dbb8c35d9063fe233626865cc836fbc102fa083b Author: David S. Miller Date: Sat Aug 30 02:04:45 2008 -0700 sparc64: setup_valid_addr_bitmap_from_pavail() should be __init Signed-off-by: David S. Miller commit bef69ea0dcce574a425feb0a5aa4c63dd108b9a6 Author: Linus Torvalds Date: Fri Aug 29 20:18:31 2008 -0700 Resource handling: add 'insert_resource_expand_to_fit()' function Not used anywhere yet, but this complements the existing plain 'insert_resource()' functionality with a version that can expand the resource we are adding in order to fix up any conflicts it has with existing resources. Signed-off-by: Linus Torvalds commit 00aeb429a0f2daeb21979873060b81095cafe4bd Merge: 316d967... df91bc2... Author: Linus Torvalds Date: Fri Aug 29 14:46:49 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: oxygen: fix distorted output on AK4396-based cards Revert "ALSA: hda - Added model selection for iMac 24"" commit 316d9679f33caf7e683471647d1472bfe133d858 Author: Andi Kleen Date: Fri Aug 29 20:06:23 2008 +0200 Don't trigger softlockup detector on network fs blocked tasks Pulling the ethernet cable on a 2.6.27-rc system with NFS mounts currently leads to an ongoing flood of soft lockup detector backtraces for all tasks blocked on the NFS mounts when the hickup takes longer than 120s. I don't think NFS problems should be all that noisy. Luckily there's a reasonably easy way to distingush this case. Don't report task softlockup warnings for tasks in TASK_KILLABLE state, which is used by the network file systems. I believe this patch is a 2.6.27 candidate. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b4609472116bb806a95e98d04767189406c74c70 Author: Linus Torvalds Date: Fri Aug 29 14:38:03 2008 -0700 Revert "x86: fix HPET regression in 2.6.26 versus 2.6.25, check hpet against BAR, v3" This reverts commit a2bd7274b47124d2fc4dfdb8c0591f545ba749dd. It wasn't really right to begin with (there's a better fix for the problem with e820 reservations clashing with PCI BAR's pending), but it also actually causes more regressions, so it should be reverted even before the better fix is finalized. Rafael reports that this commit broke AHCI detection, and thus causes the kernel to not boot on his quad core test box. Reported-and-bisected-by: Rafael J. Wysocki Cc: Yinghai Lu Cc: David Witbrodt Cc: Ingo Molnar Signed-off-by: Linus Torvalds commit df91bc23dcb052ff2da71b3482bf3c5fbf4b8a53 Author: Clemens Ladisch Date: Fri Aug 29 13:08:34 2008 +0200 ALSA: oxygen: fix distorted output on AK4396-based cards When changing the sample rate, the CMI8788's master clock output becomes unstable for a short time. The AK4396 needs the master clock to do SPI writes, so writing to an AK4396 control register directly after a sample rate change will garble the value. In our case, this leads to the DACs being misconfigured to I2S sample format, which results in a wrong output level and horrible distortions on samples louder than -6 dB. To fix this, we need to wait until the new master clock signal has become stable before doing SPI writes. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit bb23b431db7405f6d79f989ad0236bf6428ba1cb Author: FUJITA Tomonori Date: Fri Aug 29 11:47:07 2008 +0200 remove blk_register_filter and blk_unregister_filter in gendisk This patch remove blk_register_filter and blk_unregister_filter in gendisk, and adds them to sd.c, sr.c. and ide-cd.c The commit abf5439370491dd6fbb4fe1a7939680d2a9bc9d4 moved cmdfilter from gendisk to request_queue. It turned out that in some subsystems multiple gendisks share a single request_queue. So we get: Using physmap partition information Creating 3 MTD partitions on "physmap-flash": 0x00000000-0x01c00000 : "User FS" 0x01c00000-0x01c40000 : "booter" kobject (8511c410): tried to init an initialized object, something is seriously wrong. Call Trace: [<8036644c>] dump_stack+0x8/0x34 [<8021f050>] kobject_init+0x50/0xcc [<8021fa18>] kobject_init_and_add+0x24/0x58 [<8021d20c>] blk_register_filter+0x4c/0x64 [<8021c194>] add_disk+0x78/0xe0 [<8027d14c>] add_mtd_blktrans_dev+0x254/0x278 [<8027c8f0>] blktrans_notify_add+0x40/0x78 [<80279c00>] add_mtd_device+0xd0/0x150 [<8027b090>] add_mtd_partitions+0x568/0x5d8 [<80285458>] physmap_flash_probe+0x2ac/0x334 [<802644f8>] driver_probe_device+0x12c/0x244 [<8026465c>] __driver_attach+0x4c/0x84 [<80263c64>] bus_for_each_dev+0x58/0xac [<802633ec>] bus_add_driver+0xc4/0x24c [<802648e0>] driver_register+0xcc/0x184 [<80100460>] _stext+0x60/0x1bc In the long term, we need to fix such subsystems but we need a quick fix now. This patch add the command filter support to only sd and sr though it might be useful for other SG_IO users (such as cciss). Signed-off-by: FUJITA Tomonori Reported-by: Manuel Lauss Signed-off-by: Jens Axboe commit e3c71a32915fabb095de7108c22672e457631a08 Author: David S. Miller Date: Thu Aug 28 21:02:58 2008 -0700 sparc: Fix resource flags for PCI children in OF device tree. When a device is under an EBUS or ISA bus, the resource flags don't get set properly. Fix this by re-evaluating the resource flags at each level of bus as we apply ranges on the way to the root. And let PCI override any existing flags setting, but don't let the default flags calculator make such overrides. Signed-off-by: David S. Miller commit c76da9da1fffa6de263486df54950eb328d58f71 Author: Steve French Date: Thu Aug 28 15:32:22 2008 +0000 [CIFS] Turn off Unicode during session establishment for plaintext authentication LANMAN session setup did not support Unicode (after session setup, unicode can still be used though). Fixes samba bug# 5319 CC: Jeff Layton CC: Stable Kernel Signed-off-by: Steve French commit 2e655021b8d50b5d90ce442f3de6bf3667729910 Author: Steve French Date: Thu Aug 28 15:30:06 2008 +0000 [CIFS] update cifs change log Signed-off-by: Steve French commit 838726c4756813576078203eb7e1e219db0da870 Author: Jeff Layton Date: Thu Aug 28 07:54:59 2008 -0400 cifs: fix O_APPEND on directio mounts The direct I/O write codepath for CIFS is done through cifs_user_write(). That function does not currently call generic_write_checks() so the file position isn't being properly set when the file is opened with O_APPEND. It's also not doing the other "normal" checks that should be done for a write call. The problem is currently that when you open a file with O_APPEND on a mount with the directio mount option, the file position is set to the beginning of the file. This makes any subsequent writes clobber the data in the file starting at the beginning. This seems to fix the problem in cursory testing. It is, however important to note that NFS disallows the combination of (O_DIRECT|O_APPEND). If my understanding is correct, the concern is races with multiple clients appending to a file clobbering each others' data. Since the write model for CIFS and NFS is pretty similar in this regard, CIFS is probably subject to the same sort of races. What's unclear to me is why this is a particular problem with O_DIRECT and not with buffered writes... Regardless, disallowing O_APPEND on an entire mount is probably not reasonable, so we'll probably just have to deal with it and reevaluate this flag combination when we get proper support for O_DIRECT. In the meantime this patch at least fixes the existing problem. Signed-off-by: Jeff Layton Cc: Stable Tree Signed-off-by: Steve French commit 66e4f8c076f8803e83879d986a7803a918b2129e Author: David S. Miller Date: Wed Aug 27 20:03:22 2008 -0700 sparc32: Implement smp_call_function_single(). Reported by Stephen Rothwell. Needed to fix the build when CONFIG_RELAY is enabled. Signed-off-by: David S. Miller commit 6405c9cd9bf7b1c35ed76ef8ee3e217056285702 Merge: bcc55c6... 4c246ed... Author: Steve French Date: Thu Aug 28 02:47:00 2008 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 commit bcc55c6664a90146149ba0fd93052adc94287b9f Author: Steve French Date: Wed Aug 27 21:30:22 2008 +0000 [CIFS] Fix plaintext authentication The last eight bytes of the password field were not cleared when doing lanman plaintext password authentication. This patch fixes that. I tested it with Samba by setting password encryption to no in the server's smb.conf. Other servers also can be configured to force plaintext authentication. Note that plaintexti authentication requires setting /proc/fs/cifs/SecurityFlags to 0x30030 on the client (enabling both LANMAN and also plaintext password support). Also note that LANMAN support (and thus plaintext password support) requires CONFIG_CIFS_WEAK_PW_HASH to be enabled in menuconfig. CC: Jeff Layton CC: Stable Kernel Signed-off-by: Steve French commit 93a1a5eb70be5cc14990b97ef2460212e32658dc Author: Takashi Iwai Date: Wed Aug 27 07:56:43 2008 +0200 Revert "ALSA: hda - Added model selection for iMac 24"" This reverts commit 3e0e469fa216ec70c93b1593821b759d19ee2e6b. The patch introduced a wrong detection of other intel Macs with ALC88* codec because they share the same PCI SSID (but have different codec subsystem-IDs). See http://lkml.org/lkml/2008/8/24/143 Reported-and-tested-by: Guillaume Chazarain Signed-off-by: Takashi Iwai commit 24b8b44780a2c53ecb738f4a1c08d114f5eda27c Author: Tom Tucker Date: Wed Aug 13 11:05:41 2008 -0500 svcrdma: Fix race between svc_rdma_recvfrom thread and the dto_tasklet RDMA_READ completions are kept on a separate queue from the general I/O request queue. Since a separate lock is used to protect the RDMA_READ completion queue, a race exists between the dto_tasklet and the svc_rdma_recvfrom thread where the dto_tasklet sets the XPT_DATA bit and adds I/O to the read-completion queue. Concurrently, the recvfrom thread checks the generic queue, finds it empty and resets the XPT_DATA bit. A subsequent svc_xprt_enqueue will fail to enqueue the transport for I/O and cause the transport to "stall". The fix is to protect both lists with the same lock and set the XPT_DATA bit with this lock held. Signed-off-by: Tom Tucker Signed-off-by: J. Bruce Fields