commit 9a1d1035631ad8b3edf301b273c30bdfc75de01e Merge: 8837e34... a6da74c... Author: Linus Torvalds Date: Fri Dec 19 11:37:23 2008 -0800 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] mpt fusion: clear list of outstanding commands on host reset [SCSI] scsi_lib: only call scsi_unprep_request() under queue lock [SCSI] ibmvstgt: move crq_queue_create to the end of initialization [SCSI] libiscsi REGRESSION: fix passthrough support with older iscsi tools [SCSI] aacraid: disable Dell Percraid quirk on Adaptec 2200S and 2120S commit 8837e341cc76372716b1576dd88fbf832acd29d4 Merge: 281981c... 5bd9c69... Author: Linus Torvalds Date: Fri Dec 19 11:37:07 2008 -0800 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: Fix a Oops bug in omap soc driver. ALSA: hda - Remove non-working headphone control for Dell laptops ALSA: hda - Add no-jd model for IDT 92HD73xx ALSA: Revert "ALSA: hda: removed unneeded hp_nid references" ALSA: hda - Add quirk for Dell Studio 17 ALSA: hda - Fix silent HP output on D975 commit 281981ca87b9181e5408b0a7b33d3d7cf0c9a5ca Merge: f3485c8... d8a0be6... Author: Linus Torvalds Date: Fri Dec 19 11:36:49 2008 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: cciss: fix problem that deleting multiple logical drives could cause a panic commit f3485c82f75eeb951162dda663f45714627a85f5 Merge: db873cf... ac5c4e7... Author: Linus Torvalds Date: Fri Dec 19 11:36:04 2008 -0800 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/i915: GEM on PAE has problems - disable it for now. drm/i915: Don't return busy for buffers left on the flushing list. commit db873cfc7c0a6f34ab0f1c811fc245273adf35af Merge: eae34c6... a2ed961... Author: Linus Torvalds Date: Fri Dec 19 11:34:36 2008 -0800 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: Don't read past end of bitmap when reading bitmap. commit eae34c67940f2a71837ed30d571b93572186d46b Merge: 929096f... 3e3d0e9... Author: Linus Torvalds Date: Fri Dec 19 11:33:10 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI hotplug: ibmphp: Fix module ref count underflow PCI hotplug: acpiphp wants a 64-bit _SUN PCI: pciehp: fix unexpected power off with pciehp_force PCI: fix aer resume sanity check commit 5bd9c69649754cd4b1a96cdbe5caa4e5d1d35eb5 Merge: 8f55c1e... 19b3f31... Author: Takashi Iwai Date: Fri Dec 19 15:37:12 2008 +0100 Merge branch 'fix/asoc' into for-linus commit 19b3f31609dc8be3a56c78dcb7da723f10f7009c Author: Stanley Miao Date: Fri Dec 19 22:08:22 2008 +0800 ALSA: Fix a Oops bug in omap soc driver. There will be a Oops or frequent underrun messages when playing music with omap soc driver, this is because a data region is incorretly sized, other data region will be overwriten when writing to this data region. Signed-off-by: Stanley Miao Acked-by: Jarkko Nikula Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit 8f55c1e51fbb03998708bdd97d5b6665ab92462d Author: Takashi Iwai Date: Fri Dec 19 14:02:32 2008 +0100 ALSA: hda - Remove non-working headphone control for Dell laptops The previous commit re-enabled hp_nid setup for IDT92HD73*, but it's unneeded indeed for Dell laptops that have multiple headphones. Setting the extra hp_nid results in a non-working "Headpohne" mixer control. Thus hp_nid should be 0 for these dell models. Also, the automatic addition of hp_nid should check whether it's a dual-HP model or not. For dual-HPs, the pins are already checked by the early workaround. Signed-off-by: Takashi Iwai commit 9e43f0de690211cf7153b5f3ec251bc315647ada Author: Takashi Iwai Date: Wed Dec 17 14:51:01 2008 +0100 ALSA: hda - Add no-jd model for IDT 92HD73xx Added the model without the jack-detection for some desktops that have really no jack-detection. The recent driver caused regressions regarding the sound output on such machines. Signed-off-by: Takashi Iwai commit 85f13b673f6a59d29529b2a60b88306c68e7b56c Author: Takashi Iwai Date: Fri Dec 19 08:20:38 2008 +0100 ALSA: Revert "ALSA: hda: removed unneeded hp_nid references" This reverts commit 07f455f779acfb3eba4921fd1399761559b10fa9. ALSA: hda: removed unneeded hp_nid references Removed unneeded hp_nid references for 92hd73xx codec family. This caused the silent output on some Intel desktops due to missing routing of widget 0x0a and 0x0d. Signed-off-by: Takashi Iwai commit d8a0be6ab7ba1ffa43e7ea0dcdde3e8b68d4f762 Author: Stephen M. Cameron Date: Thu Dec 18 14:55:11 2008 +0100 cciss: fix problem that deleting multiple logical drives could cause a panic Fix problem that deleting multiple logical drives could cause a panic. It fixes a panic which can be easily reproduced in the following way: Just create several "arrays," each with multiple logical drives via hpacucli, then delete the first array, and it will blow up in deregister_disk(), in the call to get_host() when it tries to dig the hba pointer out of a NULL queue pointer. The problem has been present since my code to make rebuild_lun_table behave better went in. Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit fa620e97feae731f3d461baaac4da0b127b6fd8e Author: Joerg Schirottke Date: Fri Dec 19 08:13:49 2008 +0100 ALSA: hda - Add quirk for Dell Studio 17 Added the matching model=dell-m6 for Dell Studio 17 laptop. Signed-off-by: Joerg Schirottke Signed-off-by: Takashi Iwai commit ac5c4e76180a74c7f922f6fa71ace0cef45fa433 Author: Dave Airlie Date: Fri Dec 19 15:38:34 2008 +1000 drm/i915: GEM on PAE has problems - disable it for now. On PAE systems, GEM allocates pages using shmem, and passes these pages to be bound into AGP, however the AGP interfaces + the x86 set_memory interfaces all take unsigned long not dma_addr_t. The initial fix for this was a mess, so we need to do this correctly for 2.6.29. Signed-off-by: Dave Airlie commit c4de0a5d671e3af38dc3496538e391782aecc3a5 Author: Eric Anholt Date: Sun Dec 14 19:05:04 2008 -0800 drm/i915: Don't return busy for buffers left on the flushing list. These buffers don't have active rendering still occurring to them, they just need either a flush to be emitted or a retire_requests to occur so that we notice they're done. Return unbusy so that one of the two occurs. The two expected consumers of this interface (OpenGL and libdrm_intel BO cache) both want this behavior. Signed-off-by: Eric Anholt Acked-by: Keith Packard Signed-off-by: Dave Airlie commit a2ed9615e3222645007fc19991aedf30eed3ecfd Author: NeilBrown Date: Fri Dec 19 16:25:01 2008 +1100 md: Don't read past end of bitmap when reading bitmap. When we read the write-intent-bitmap off the device, we currently read a whole number of pages. When PAGE_SIZE is 4K, this works due to the alignment we enforce on the superblock and bitmap. When PAGE_SIZE is 64K, this case read past the end-of-device which causes an error. When we write the superblock, we ensure to clip the last page to just be the required size. Copy that code into the read path to just read the required number of sectors. Signed-off-by: Neil Brown Cc: stable@kernel.org commit e28d83223a1e5672174dcdc6b73c1be3fa3de877 Author: Takashi Iwai Date: Wed Dec 17 13:48:29 2008 +0100 ALSA: hda - Fix silent HP output on D975 Some desktops seems to have no HP/mic jack detection on the front panel, which results in the silent output in the recent driver, because the driver mutes the output (to save power) when no plug is detected. This patch adds a new model that disables the jack-detection. Signed-off-by: Takashi Iwai commit 3e3d0e9246d0eccc1da800348fc1b9199ae3d768 Author: Neil Horman Date: Wed Dec 17 16:07:47 2008 -0800 PCI hotplug: ibmphp: Fix module ref count underflow I happened to notice that the ibmphp hotplug driver does something rather silly in its init routine. It purposely calls module_put so as to underflow its module ref count to avoid being removed from the kernel. This is bad practice, and wrong, since it provides a window for subsequent module_gets to reset the refcount to zero, allowing an unload to race in and cause all sorts of mysterious panics. If the module is unsafe to load, simply omitting the module_exit parameter is sufficient to prevent the kernel from allowing the unload. Acked-by: Greg Kroah-Hartman Signed-off-by: Neil Horman Signed-off-by: Jesse Barnes commit b6adc1955d31515be6631e63b1fe4bcdcd41db77 Author: Justin Chen Date: Thu Dec 11 11:16:44 2008 -0700 PCI hotplug: acpiphp wants a 64-bit _SUN Certain HP machines require the full 64 bits of _SUN as allowed by the ACPI spec. Without this change, we get name collisions in the lower 32 bits of the _SUN returned by firmware. Acked-by: Matthew Wilcox Signed-off-by: Justin Chen Signed-off-by: Alex Chiang Signed-off-by: Jesse Barnes commit db9aaf0bf19886114935152996edd9c6683b741c Author: Kenji Kaneshige Date: Mon Dec 8 14:30:24 2008 +0900 PCI: pciehp: fix unexpected power off with pciehp_force This patch fixes the problem that causes an occupied slot to be turned off even if it has a working device. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit b0b801dd7de3d77bb143d3c98199b487df0fc63a Author: Hidetoshi Seto Date: Mon Dec 1 16:31:06 2008 +0900 PCI: fix aer resume sanity check What we have to check here before calling is err_handler->resume, not ->slot_reset. Looks like a copy & paste error from report_slot_reset. Acked-by: Yanmin Zhang Signed-off-by: Hidetoshi Seto Signed-off-by: Jesse Barnes commit a6da74cb077e88a604e5b2a6663b44c221f0ae75 Author: James Bottomley Date: Mon Dec 15 14:13:27 2008 -0600 [SCSI] mpt fusion: clear list of outstanding commands on host reset A bug in the fusion driver was exposed by the switch to block timeout. Basically, drivers are supposed to terminate commands once error handling begins on them. The fusion apparently wasn't doing this. Under the old timeout regime, completions on terminated commands would by and large get ignored because of the way command timeouts used to work. The new block timers are very intolerant to this, though, becuase the request gets cleaned and freed. Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=12195 Reported-by: Alex Shi Tested-by: Ming Lin Cc: Eric Moore Signed-off-by: James Bottomley commit 02bd3499a3be984f1e88821c3ed252c8c49c498e Author: James Bottomley Date: Fri Dec 12 13:28:29 2008 -0600 [SCSI] scsi_lib: only call scsi_unprep_request() under queue lock It's called under that lock everywhere else and it does alter the request state, so it should be. This one occurance in scsi_requeue_command() could open a window where req->special is set to NULL while the requests is going through either timeout or completion processing leading to NULL pointer derefs of the sort complained of in bugzillas 12020 and 12195. Signed-off-by: James Bottomley commit 57458036af75c6dbb62bee04b3982e92261eddb1 Author: Brian King Date: Tue Dec 9 20:03:50 2008 +0900 [SCSI] ibmvstgt: move crq_queue_create to the end of initialization Calling crq_queue_create could lead to the creation of a rport. We need to set up everything before creating a rport. This moves crq_queue_create to the end of initialization to avoid a race which causes an oops if lost. Signed-off-by: Brian King Signed-off-by: FUJITA Tomonori Reported-by: Olaf Hering Cc: stable@kernel.org Signed-off-by: James Bottomley commit d3acf0226debeae22d87808f8f298386bd08e391 Author: Mike Christie Date: Mon Dec 1 12:13:00 2008 -0600 [SCSI] libiscsi REGRESSION: fix passthrough support with older iscsi tools This regression was added in 2.6.27, when the mtask and ctask were merged into the the common task struct. The patch applies to scsi-rc-fixes, but also applies to 2.6.27 with some offsets. The problem is that __iscsi_conn_send_pdu assumes that userspace was not sending nops with the format it is checking for in the "if" below. It turns out that older userspace tools are. This patch moves the setting of the internal ping_task tracker (it tracks libiscsi current outstanding nop) to iscsi_send_nopout which is only used by kernel callers. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit b21227c5fcadab206e2a2373e5b288a351919abb Author: Hillier, Gernot Date: Wed Sep 17 16:03:06 2008 +0200 [SCSI] aacraid: disable Dell Percraid quirk on Adaptec 2200S and 2120S A lot of 64bit machines with Adaptec 2200S and 2120S controllers don't recognize SCSI disks any more with the patch commit 94cf6ba11b068b8a8f68a1e88bffb6827e92124b Author: Salyzyn, Mark Date: Thu Dec 13 16:14:18 2007 -0800 [SCSI] aacraid: fix driver failure with Dell PowerEdge Expandable RAID Controller 3/Di but fail with tons of "aac_srb: aac_fib_send failed with status: 8195" instead. This patch disables the quirk introduced in the change cited above for those two controllers again. [thenzl: added 2120S Controller] Signed-off-by: Gernot Hillier Signed-off-by: Tomas Henzl Acked-by: Matt Domsch Cc: AACRAID list Cc: Stable Tree Signed-off-by: James Bottomley