commit 365bbe0d0caaf2ba74d56556827babf0bc66965d Merge: 0bf9854... 3ef49a3... Author: Linus Torvalds Date: Mon Jan 22 10:35:34 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (30 commits) [SCSI] qla1280: set residual correctly [SCSI] fusion: bump version [SCSI] fusion: MODULE_VERSION support [SCSI] fusion: power pc and miscellaneous bug fixs [SCSI] fusion: fibre channel: return DID_ERROR for MPI_IOCSTATUS_SCSI_IOC_TERMINATED [SCSI] megaraid_sas: Update module author [SCSI] 3ware 8000 serialize reset code [SCSI] sr: fix error code check in sr_block_ioctl() [SCSI] scsi: lpfc error path fix [SCSI] aacraid: Product List Update [SCSI] libiscsi: fix senselen calculation [SCSI] iscsi: simplify IPv6 and IPv4 address printing [SCSI] iscsi: newline in printk [SCSI] iscsi: fix crypto_alloc_hash() error check [SCSI] iscsi: fix 2.6.19 data digest calculation bug [SCSI] scsi_scan: fix report lun problems with CDROM or RBC devices [SCSI] qla2xxx: Update version number to 8.01.07-k4. [SCSI] qla2xxx: Use generic isp_ops.fw_dump() function. [SCSI] qla2xxx: Perform a fw-dump when an ISP23xx RISC-paused state is detected. [SCSI] qla2xxx: Correct reset handling logic. ... commit 0bf98542a07ee1341830dcc4be63df85645f76b9 Merge: b4a2c87... d8c8a39... Author: Linus Torvalds Date: Mon Jan 22 09:23:23 2007 -0800 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-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage HID: add missing RX, RZ and RY enum values to hid-debug output HID: hid/hid-input.c doesn't need to include linux/usb/input.h HID: compilation fix when DEBUG_DATA is defined HID: proper LED-mapping for SpaceNavigator HID: update MAINTAINERS entry for USB-HID HID: GEYSER4_ISO needs quirk HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT commit b4a2c87dada12010239b4d5f8f9bc0eb964a614f Merge: e45521a... e89debc... Author: Linus Torvalds Date: Mon Jan 22 09:21:02 2007 -0800 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 defconfigs [POWERPC] atomic_dec_if_positive sign extension fix [POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code [POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable [POWERPC] Fix broken DMA on non-LPAR pSeries [POWERPC] Fix cell's mmio nvram to properly parse device tree [POWERPC] Remove bogus sanity check in pci -> OF node code commit e45521a8d44da2c4efd17fc8e853f7917e99b57a Merge: 79d2628... 2806ccd... Author: Linus Torvalds Date: Mon Jan 22 09:07:00 2007 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Delete duplicate call to load_irq_save. [MIPS] SMTC: Fix cp0 hazard. commit 79d26287021d3158e3cb8da820f1b8233564dd3b Merge: c8fefb1... c70a8c3... Author: Linus Torvalds Date: Mon Jan 22 08:57:03 2007 -0800 Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon/w83793: Hide invalid VID readings hwmon/w83793: Fix the fan input detection hwmon/w83793: Ignore disabled temperature channels hwmon: Fix the VRD 11 decoding hwmon/w83793: Remove the description of AMDSI and update the voltage formula commit c8fefb1bb4b38607d305c7e9ef55f146c9c628cb Merge: a99d726... bd62b23... Author: Linus Torvalds Date: Mon Jan 22 08:55:56 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6: NTFS: Forgot to bump version number in makefile to 2.1.28... NTFS: 2.1.28 - Fix deadlock reported by Sergey Vlasov due to ntfs_put_inode(). commit a99d726bd0574991245fe7d38e8b11c41089eee4 Merge: e55cec4... 412297d... Author: Linus Torvalds Date: Mon Jan 22 08:55:28 2007 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5023): Fix compilation on ppc32 architecture V4L/DVB (5071): Tveeprom: autodetect LG TAPC G701D as tuner type 37 V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory V4L/DVB (5033): MSI TV@nywhere Plus fixes V4L/DVB (5029): Ks0127 status flags V4L/DVB (5024): Fix quickcam communicator driver for big endian architectures V4L/DVB (5021): Cx88xx: Fix lockup on suspend V4L/DVB (5020): Fix: disable interrupts while at KM_BOUNCE_READ V4L/DVB (5019): Fix the frame->grabstate update in read() entry point. commit e55cec4ff1080e36ed1dbfaee46fe05d64f4eae2 Merge: 6d3154c... 6f94990... Author: Linus Torvalds Date: Mon Jan 22 08:54:48 2007 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc: Correct definition of R6 omap: Update MMC response types commit 6d3154cc1143f62c3b80d9929caeaec6db8cb451 Author: Linus Torvalds Date: Mon Jan 22 08:53:24 2007 -0800 Revert "[PATCH] Fix up mmap_kmem" This reverts commit 99a10a60ba9bedcf5d70ef81414d3e03816afa3f. As per Hugh Dickins: "Nadia Derbey has reported that mmap of /dev/kmem no longer works with the kernel virtual address as offset, and Franck has confirmed that his patch came from a misunderstanding of what an offset means to /dev/kmem - whereas his patch description seems to say that he was correcting the offset on a few plaforms, there was no such problem to correct, and his patch was in fact changing its API on all platforms." Suggested-by: Hugh Dickins Cc: Franck Bui-Huu Cc: Nadia Derbey Cc: Andi Kleen Cc: Arjan van de Ven Cc: Andrew Morton Signed-off-by: Linus Torvalds commit e89debcd18a3ef74b27894e479d6b9e658fc6de6 Author: Paul Mackerras Date: Mon Jan 22 22:39:24 2007 +1100 [POWERPC] Update defconfigs Mostly took the defaults, except tried to get the netfilter options more or less as they were before. Signed-off-by: Paul Mackerras commit 434f98c48fc1d2a1f562a28a1562a7b53e940957 Author: Robert Jennings Date: Wed Jan 17 10:50:20 2007 -0600 [POWERPC] atomic_dec_if_positive sign extension fix On 64-bit machines, if an atomic counter is explicitly set to a negative value, the atomic_dec_if_positive function will decrement and store the next smallest value in the atomic counter, contrary to its intended operation. The comparison to determine if the decrement will make the result negative was done by the "addic." instruction, which operates on a 64-bit value, namely the zero-extended word loaded from the atomic variable. This patch uses an explicit word compare (cmpwi) and changes the addic. to an addi (also changing "=&r" to "=&b" so that r0 isn't used, and addi doesn't become li). This also fixes a bug for both 32-bit and 64-bit in that previously 0x80000000 was considered positive, since the result after decrementing is positive. Now it is considered negative. Also, I clarify the return value in the comments just to make it clear that the value returned is always the decremented value, even if that value is not stored back to the atomic counter. Signed-off-by: Robert Jennings Signed-off-by: Paul Mackerras commit 06cd9396778d5b70ba27fa8158db78d6bc0f007b Author: Li Yang Date: Wed Jan 17 14:42:22 2007 +0800 [POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code Incorrect use of of_find_node_by_name() causes of_node_put() on a node which has already been put. It causes the refcount of the node to underflow, which triggers the WARN_ON in kref_get for 836x and 832x. This fixes it. Signed-off-by: Li Yang Signed-off-by: Paul Mackerras commit 121361f72ca93cb6710e368bb89f9d976b1da443 Author: Grant Likely Date: Fri Jan 19 00:00:14 2007 -0700 [POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable Documentation-only change. The 5200 device tree layout has not yet stablized, so nobody should depend on the layout of the tree. Signed-off-by: Grant Likely Acked-by: Sylvain Munaut Signed-off-by: Paul Mackerras commit 77319254f109963213f33cbb15e0103f2e81a64a Author: Linas Vepstas Date: Wed Jan 10 19:16:29 2007 -0600 [POWERPC] Fix broken DMA on non-LPAR pSeries It appears that the iommu table address is never stored, and thus never found, on non-lpar systems. Thus, for example, during boot: <7>[ 93.067916] PCI: Scanning bus 0001:41 <7>[ 93.068542] PCI: Found 0001:41:01.0 [8086/100f] 000200 00 <7>[ 93.068550] PCI: Calling quirk c0000000007822e0 for 0001:41:01.0 <7>[ 93.069815] PCI: Fixups for bus 0001:41 <4>[ 93.070167] iommu: Device 0001:41:01.0 has no iommu table <7>[ 93.070251] PCI: Bus scan for 0001:41 returning with max=41 No iommu table? How can that be? Well, circa line 471 of arch/powerpc/platforms/pseries/iommu.c we see the code: while (dn && PCI_DN(dn) && PCI_DN(dn)->iommu_table == NULL) dn = dn->parent; and a few lines later is the surprising print statement about the missing table. Seems that this loop ran unto the end, never once finding a non-null PCI_DN(dn)->iommu_table. The problem can be found a few lines earlier: it sems that the value of PCI_DN(dn)->iommu_table is never ever set. Thus, the patch sets it. The patch was tested on a Power4 system running in full system partition mode, which is where I saw the problem. It works; I've not done any wider testing. Had a brief discussion on this on irc. Signed-off-by: Linas Vepstas Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6984ee797a8798128e94ab2447c8ed91f0156eb5 Author: Benjamin Herrenschmidt Date: Thu Jan 11 16:08:41 2007 +1100 [POWERPC] Fix cell's mmio nvram to properly parse device tree The mmio nvram driver (used by cell only atm) isn't properly parsing the device-tree, meaning that nvram isn't found correctly on the new Cell blades. It works ok for old blades where the nvram is at the root of the device tree but fails on Malta and CAB when it's hanging off axon. This fixes it by using the proper OF parsing functions. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 4ef6e68117e93111590d9d4ada1a282304241169 Author: Benjamin Herrenschmidt Date: Thu Jan 11 16:38:22 2007 +1100 [POWERPC] Remove bogus sanity check in pci -> OF node code The new implementation of pci_device_to_OF_node() on ppc32 has a bogus sanity check in it that can cause oopses at boot when no device node is present, and might hit correct cases with older/weird apple device-trees where they have the type "vci" for the chaos bridge. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d8c8a393166d6283003fb111d0b4a40931c0eda4 Author: Jeremy Roberson Date: Fri Jan 19 15:44:18 2007 -0700 hid-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist Adds GTCO CalComp Interwrite IPanels to the hid-core.c blacklist. Signed-off-by: Jeremy A. Roberson Signed-off-by: Jiri Kosina commit be8209753b014f2d7a92b2ec3ff82db478fc86d1 Author: Anssi Hannula Date: Fri Jan 19 19:28:17 2007 +0200 HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage The commit 4916b3a57fc94664677d439b911b8aaf86c7ec23 introduced a hid regression between 2.6.19 and 2.6.20-rc1. The device put in input_dev->cdev is now of type usb_device instead of usb_interface. Before: > # readlink -f /sys/class/input/input6/event4/device > /sys/devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.1 After: > # readlink -f /sys/class/input/input3/event3/device > /sys/devices/pci0000:00/0000:00:10.0/usb1/1-1 This causes breakage: > # udevinfo -q all -n /dev/input/event3 > P: /class/input/input3/event3 > N: input/event3 > S: input/by-path/pci-1-1--event- > E: ID_SERIAL=noserial > E: ID_PATH=pci-1-1- No ID_MODEL, ID_VENDOR, ID_REVISION, ID_TYPE etc etc. Fix this by assigning the intf->dev into hid->dev, and fixing all the users. Signed-off-by: Anssi Hannula Signed-off-by: Jiri Kosina commit f7ebf99eb489a02dba2e5a071fde9f5354275a50 Author: Simon Budig Date: Mon Jan 15 18:34:32 2007 +0100 HID: add missing RX, RZ and RY enum values to hid-debug output This trivial change adds some missing enum values to the hid-debug output. Signed-off-by: Simon Budig Signed-off-by: Jiri Kosina commit 1f3ab013336e76687441462961000157c8980bb8 Author: Jiri Kosina Date: Tue Jan 16 00:30:42 2007 +0100 HID: hid/hid-input.c doesn't need to include linux/usb/input.h There is no reason for generic hid-input.c to include usb-specific input.h. As a sideeffect, this also fixes warning of redefinition of dbg() macro, when hid-input.c is compiled with DEBUG (as there is a clash between dbg() from hid.h and usb/input.h). Signed-off-by: Jiri Kosina commit e54dea69bac12dae2ff27c1c7a472d4eee70638d Author: Jiri Kosina Date: Mon Jan 15 23:53:05 2007 +0100 HID: compilation fix when DEBUG_DATA is defined hid/hid-core.c references 'len' variable when DEBUG_DATA is defined, but the actual name of the variable is 'size'. Fix it. Signed-off-by: Jiri Kosina commit d4ae650a904612ffb7edd3f28b69b022988d2466 Author: Simon Budig Date: Mon Jan 15 17:28:47 2007 +0100 HID: proper LED-mapping for SpaceNavigator This change introduces a mapping for LED indicators between the HID specification and the Linux input subsystem. The previous code properly mapped the LEDs relevant for Keyboards, but garbeled the remaining ones. With this change all LED enums from the input system get mapped to more or less equivalent LED numbers from the HID specification. This patch also ensures that the unused bits in a HID report to the device are zeroed out. This makes the 3Dconnexion SpaceNavigator fully usable with the linux input system. Signed-off-by: Simon Budig Signed-off-by: Jiri Kosina commit 641266fdaa3c137c632f8ad2e4124248bafe7a98 Author: Jiri Kosina Date: Mon Jan 15 09:56:21 2007 +0100 HID: update MAINTAINERS entry for USB-HID Change USB-HID maintainer from Vojtech Pavlik to Jiri Kosina. Acked-by: Vojtech Pavlik Signed-off-by: Jiri Kosina commit 694400641b0da92d88db60821235aa69eb8fa556 Author: Adrian Friedli Date: Sun Jan 14 22:12:43 2007 +0100 HID: GEYSER4_ISO needs quirk I've got a newer MacBook with core2duo. Two keys on the keyboard are swapped, "unswaping" works with the same trick as GEYSER3_ISO. Signed-off-by: Adrian Friedli Signed-off-by: Jiri Kosina commit e7c4e1a58f320bafb194a411a41de29abc19315f Author: Russell King Date: Fri Jan 12 21:53:51 2007 +0000 HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT We have USB_HID _newly_ selected in configurations which didn't have it before, which overrides CONFIG_HID and builds HID without input support. Nevertheless, here's a patch to solve more of the same that my original patch attempted to solve. The original patch is still required. Seems to solve the final instance of this problem here. Signed-off-by: Russell King Signed-off-by: Jiri Kosina commit 2806ccd7ad9073f4f1a065b5672d7592e7838e97 Author: Ralf Baechle Date: Tue Dec 19 02:12:42 2006 +0100 [MIPS] Delete duplicate call to load_irq_save. This call may have resulted to local_tlb_flush_range returning with interrupts disabled resulting in excessive interrupt latency. Signed-off-by: Ralf Baechle commit c80697b3a0d05dd87eeeb55c4dd1c3dae047293e Author: Ralf Baechle Date: Wed Jan 17 18:58:44 2007 +0000 [MIPS] SMTC: Fix cp0 hazard. Signed-off-by: Ralf Baechle commit c70a8c345fd770ecb2ff334bdf88b63edaffb77d Author: Gong Jun Date: Thu Jan 18 22:14:24 2007 +0100 hwmon/w83793: Hide invalid VID readings Ignore the VID readings when the motherboard has not designed the function. Signed-off-by: Gong Jun Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit c92943152884e3777439ad40a40126f2e51b8ea8 Author: Rudolf Marek Date: Thu Jan 18 22:14:24 2007 +0100 hwmon/w83793: Fix the fan input detection Catch the cases when alternative pins are used to route the fan9-12 input. Signed-off-by: Rudolf Marek Signed-off-by: Gong Jun Signed-off-by: Jean Delvare commit 46bed4dfe5f95f1fc8f68ead592a7e295bbbe01e Author: Gong Jun Date: Thu Jan 18 22:14:24 2007 +0100 hwmon/w83793: Ignore disabled temperature channels Ignore the temperature readings when its channel is disabled, ignore AMDSI readings. Signed-off-by: Gong Jun Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit 9fab2d8b75a4084e91f1dcb4e55368406fe53010 Author: Jean Delvare Date: Thu Jan 18 22:14:23 2007 +0100 hwmon: Fix the VRD 11 decoding I wonder how we came up with such a broken test in the first place. Signed-off-by: Jean Delvare commit ddca933bd554b4f81f27776f3cb9daa67cf241b1 Author: Gong Jun Date: Thu Jan 18 22:14:23 2007 +0100 hwmon/w83793: Remove the description of AMDSI and update the voltage formula Fix the driver to match the information in datasheet 1.0. AMD SI interface is marked as reserved, computing formula for 5VDD and 5VSB is updated. Signed-off-by: Gong Jun Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit bd62b23cbcc691cc8faa6f4028783f60957b6508 Author: Anton Altaparmakov Date: Thu Jan 18 10:28:18 2007 +0000 NTFS: Forgot to bump version number in makefile to 2.1.28... Signed-off-by: Anton Altaparmakov commit 8331191e56802f0155772a3d56bc2a750acc38e1 Author: Anton Altaparmakov Date: Thu Jan 18 09:42:48 2007 +0000 NTFS: 2.1.28 - Fix deadlock reported by Sergey Vlasov due to ntfs_put_inode(). - Fix deadlock in fs/ntfs/inode.c::ntfs_put_inode(). Thanks to Sergey Vlasov for the report and detailed analysis of the deadlock. The fix involved getting rid of ntfs_put_inode() altogether and hence NTFS no longer has a ->put_inode super operation. Signed-off-by: Anton Altaparmakov commit 412297d31d439ba56cd4faeb3a49a6f569f40702 Author: Mauro Carvalho Chehab Date: Sun Jan 7 08:51:05 2007 -0300 V4L/DVB (5023): Fix compilation on ppc32 architecture There's a problem, pointed by Meelis Roos , that, on ppc32 arch, with some gcc versions (noticed with prerelease 4.1.2 20061115), compilation fails, due the lack of __ucmpdi2 to do the required 64-bit comparision. This patch takes some sugestions made by Andrew Morton , Stelian Pop and Segher Boessenkool Signed-off-by: Mauro Carvalho Chehab commit 1323fbda1343f50f198bc8bd6d1d59c8b7fc45bf Author: Michael Krufky Date: Fri Jan 12 17:38:05 2007 -0300 V4L/DVB (5071): Tveeprom: autodetect LG TAPC G701D as tuner type 37 autodetect LG TAPC G701D as tuner type 37. Thanks to Adonis Papas, for pointing out the missing autodetection for this tuner. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 10329b962be782fa4fbebea9358063a4507d0c4d Author: Gerd Hoffmann Date: Fri Jan 12 21:26:32 2007 -0300 V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory We have a DMA32 zone now, lets use it to make sure the card can reach the memory we have allocated for the video frame buffers. Signed-off-by: Gerds Hoffmann Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit e382f62be8a92ebbdf697ebfab260b7d943a359f Author: hermann pitton Date: Sun Jan 7 21:19:48 2007 -0300 V4L/DVB (5033): MSI TV@nywhere Plus fixes - MSI TV@nywhere Plus. Fix radio, S-Video and external analog audio in as far we can know currently. Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit 55d5440d4587454628a850ce26703639885af678 Author: Martin Samuelsson Date: Sun Jan 7 20:50:27 2007 -0300 V4L/DVB (5029): Ks0127 status flags Or status flags together in DECODER_GET_STATUS instead of and-zapping them. Signed-off-by: Martin Samuelsson Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit c6d704c8c4453f05717ba88792f70f8babf95268 Author: Grant Likely Date: Sun Jan 7 10:33:30 2007 -0300 V4L/DVB (5024): Fix quickcam communicator driver for big endian architectures Host endianess does not affect the order that pixel rgb data comes in from the quickcam (the values are bytes, not words or longs). The driver is erroniously swapping the order of rgb values for big endian machines. This patch is needed get the Quickcam communicator working on big endian machines (tested on powerpc) Signed-off-by: Grant Likely Signed-off-by: Mauro Carvalho Chehab commit a96afb3e9428f2e7463344f12dbc85faf08e2e09 Author: Robert Hancock Date: Sun Jan 7 08:12:19 2007 -0300 V4L/DVB (5021): Cx88xx: Fix lockup on suspend Suspending with the cx88xx module loaded causes the system to lock up because the cx88_audio_thread kthread was missing a try_to_freeze() call, which caused it to go into a tight loop and result in softlockup when suspending. Fix that. Signed-off-by: Robert Hancock Signed-off-by: Mauro Carvalho Chehab commit 35d6270b806562b37279d3970fa477aaeb372829 Author: Mauro Carvalho Chehab Date: Sun Jan 14 10:14:17 2007 -0200 V4L/DVB (5020): Fix: disable interrupts while at KM_BOUNCE_READ vivi.c uses the KM_BOUNCE_READ with local interrupts enabled. This means that if a disk interrupt occurs while vivi.c is using this fixmap slot, the vivi.c driver will, upon return from that interrupt, find that the fixmap slot now points at a different physical page. The net result will probably be rare corruption of disk file contents, because viv.c will now be altering the page which the disk code was recently using. Thanks to Andrew Morton for pointing this. Signed-off-by: Mauro Carvalho Chehab commit c430ca1e16b2b4b30f567806c73e270caea8db1d Author: Thierry MERLE Date: Fri Dec 29 20:32:08 2006 -0300 V4L/DVB (5019): Fix the frame->grabstate update in read() entry point. The Coverity checker spotted that in usbvision_v4l2_read(), the variable "frmx" is never assigned any value different from -1, but it's used an an array index in "usbvision->frame[frmx]". Thanks to Adrian Bunk for warning about that. Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 6f949909e8f9e5d7e5584dc48d9a5e060c52aed1 Author: Philip Langdale Date: Thu Jan 4 07:04:47 2007 -0800 mmc: Correct definition of R6 During development of SDHC support, it was discovered that the definition for R6 was incorrect. This patch fixes that and patches the drivers that do switch on the response type. Signed-off-by: Philip Langdale Cc: Alex Dubov Cc: Pavel Pisa Signed-off-by: Pierre Ossman commit 1b3b2631842ab60c1b7923bef102c610439ba3dd Author: Carlos Eduardo Aguiar Date: Mon Jan 15 06:38:15 2007 +0100 omap: Update MMC response types This patch is a fix in order to update MMC response types. This modification is needed to allow SD card support on OMAP platforms. Signed-off-by: Carlos Eduardo Aguiar Signed-off-by: Yuha Yrjola Signed-off-by: Pierre Ossman commit 3ef49a3b45c33b055002402f01e5da98cb773086 Author: Jes Sorensen Date: Fri Jan 5 12:05:37 2007 -0500 [SCSI] qla1280: set residual correctly Jeremy caught a bug in the qla1280 driver where it didn't set the residual value correctly. Signed-off-by: Jeremy Higdon Signed-off-by: Jes Sorensen Signed-off-by: James Bottomley commit d0a6b08ae08c2ab292f756bdae0e8b1242696d7f Author: Eric Moore Date: Thu Jan 4 20:49:03 2007 -0700 [SCSI] fusion: bump version bump version Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 9f4203b357d46a66c042df3dedf277ccaa5e2b1d Author: Eric Moore Date: Thu Jan 4 20:47:47 2007 -0700 [SCSI] fusion: MODULE_VERSION support * Add modinfo driver version support. * Change copyright year to 2007. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit f99be43b3024f2dd054f2addd54a318eabee2018 Author: Eric Moore Date: Thu Jan 4 20:46:54 2007 -0700 [SCSI] fusion: power pc and miscellaneous bug fixs * Endian fix's for warnings found in ppc environment. * Fix compile time warning when calling scsi_device_reprobe, where in newer kernels this API expects its return value to be examined. * Fix compile errors when debug messages are enabled. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 86dd424266530cda55258b2b33d04c23a88b9a9c Author: Eric Moore Date: Thu Jan 4 20:44:01 2007 -0700 [SCSI] fusion: fibre channel: return DID_ERROR for MPI_IOCSTATUS_SCSI_IOC_TERMINATED A repost of a patch forwarded by Mikael Reed from 2006-12-20. The fibre channel IOC may kill a request for a variety of reasons, some of which may be recovered by a retry, some of which are unlikely to be recovered. Return DID_ERROR instead of DID_RESET to permit retry of the command, just not an infinite number of them. Signed-off-by: Michael Reed Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 3d6d174a0888fe082e87ce1d4a0f1a85044a4515 Author: Sumant Patro Date: Fri Dec 29 08:13:54 2006 -0800 [SCSI] megaraid_sas: Update module author Update domain name change from lsil.com to lsi.com. Change module author to megaraidlinux@lsi.com Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit 4fe48187da5a0229be3951761b66cd426430a52b Author: adam radford Date: Thu Jan 4 18:16:56 2007 -0800 [SCSI] 3ware 8000 serialize reset code The attached patch updates the 3ware 8000 driver: - Free irq handler in __tw_shutdown(). - Turn on RCD bit for caching mode page. - Serialize reset code. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 6397256b0af52082db3b7f804aa3b612a17dcbc9 Author: Tejun Heo Date: Tue Jan 2 17:41:04 2007 +0900 [SCSI] sr: fix error code check in sr_block_ioctl() sr_block_ioctl() should proceed to SCSI ioctls if cdrom_ioctl() returns -ENOSYS. However it tested for ENOSYS instead of -ENOSYS rendering all SCSI ioctls other than GET_IDLUN and GET_BUS_NUMBER inaccessible. Fix it. Signed-off-by: Tejun Heo Signed-off-by: James Bottomley commit a96e0c7798057dd8055d0263c076fed975c10237 Author: Mariusz Kozlowski Date: Tue Jan 2 01:07:32 2007 +0100 [SCSI] scsi: lpfc error path fix Add kmalloc failure check and fix the loop on error path. Without the patch pool element at index [0] will not be freed. Signed-off-by: Mariusz Kozlowski Acked-by: James Smart Signed-off-by: James Bottomley commit 8e9d58e723e29e8b04c09bd9badd81c1d8232f5f Author: Salyzyn, Mark Date: Mon Dec 18 15:01:41 2006 -0500 [SCSI] aacraid: Product List Update Update drivers/scsi/aacraid/linit.c and Documentation/scsi/aacraid.txt file with the current list of adapters supported by the aacraid driver. Deprecated a few adapters that never shipped, corrected a few and added new adapters that matched the family code support. No functional changes to the driver. No side effects. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit 9b80cb4be1f4181875e0cf274dc59f42964fdf1b Author: Mike Christie Date: Sun Dec 17 12:10:28 2006 -0600 [SCSI] libiscsi: fix senselen calculation Yanling Qi, noted that when the sense data length of a check-condition is greater than 0x7f (127), senselen = (data[0] << 8) | data[1] will become negative. It causes different kinds of panics from GPF, spin_lock deadlock to spin_lock recursion. We were also swapping this value on big endien machines. This patch fixes both issues by using be16_to_cpu(). Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 94cb3f822bb806a750e1e1c8457bee6e96671569 Author: FUJITA Tomonori Date: Sun Dec 17 12:10:27 2006 -0600 [SCSI] iscsi: simplify IPv6 and IPv4 address printing Signed-off-by: FUJITA Tomonori Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 09492605aa3e17ce19572b9e925ecf66e4da55dd Author: Meelis Roos Date: Sun Dec 17 12:10:26 2006 -0600 [SCSI] iscsi: newline in printk This patch cures two run together printk messages in iSCSI driver. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 59c17ec1690fd76ce6ae586daac29b04601be3e0 Author: Akinobu Mita Date: Sun Dec 17 12:10:25 2006 -0600 [SCSI] iscsi: fix crypto_alloc_hash() error check The return value of crypto_alloc_hash() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit c959e1c2a475e0ad0d24eff200de9b6dcb3710c6 Author: Arne Redlich Date: Sun Dec 17 12:10:24 2006 -0600 [SCSI] iscsi: fix 2.6.19 data digest calculation bug The transition from crypto_digest_*() to the crypto_hash_*() family introduced a bug into the data digest calculation: crypto_hash_update() is called with the number of S/G elements instead of the S/G lists data size. Signed-off-by: Arne Redlich Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ddaf6fc85459d161c39a70a2cf9e04343dafe47f Author: James Bottomley Date: Wed Dec 13 10:10:40 2006 -0600 [SCSI] scsi_scan: fix report lun problems with CDROM or RBC devices Apparently no ATAPI CD/DVD actually supports REPORT LUNS (in spite of claiming scsi-3 compliance, where it's mandatory) and worse, some crash or flake out on being sent the command. This may actually be due to a conflict between SPC and MMC with MMC not listing REPORT LUNS as mandatory. The same standards conflict exists for RBC as well. Fix all of this by reversing the blacklists for CDROM and RBC devices (i.e. now they have to have the BLIST_REPORTLUNS2 flag set even if the inquiry data returns scsi-3 compliance). Signed-off-by: James Bottomley commit 03c1c39680f949e0a944d540949b2d3d6887cdc0 Author: Andrew Vasquez Date: Wed Dec 13 19:20:33 2006 -0800 [SCSI] qla2xxx: Update version number to 8.01.07-k4. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 96ca5cad09edd86da9c8fd613c9406cdf978cd6d Author: Andrew Vasquez Date: Wed Dec 13 19:20:32 2006 -0800 [SCSI] qla2xxx: Use generic isp_ops.fw_dump() function. Rather than a direct call, as was done in the case of a RISC-paused state within the ISP24xx interrupt handler. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 07f31805e1fa98f802f60433cdd1c0461120ef0e Author: Andrew Vasquez Date: Wed Dec 13 19:20:31 2006 -0800 [SCSI] qla2xxx: Perform a fw-dump when an ISP23xx RISC-paused state is detected. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 0c8c39af1699227e5a5d13e54a71f93347fe4f61 Author: Andrew Vasquez Date: Wed Dec 13 19:20:30 2006 -0800 [SCSI] qla2xxx: Correct reset handling logic. - honor ISP24XX NVRAM settings for lip-reset, full-login-lip, and device-reset. - correct LIP_FULL_LOGIN mailbox command issuance. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8bc69e7dc307d6195d92fa87da1fcbae6e5dda69 Author: Andrew Vasquez Date: Wed Dec 13 19:20:29 2006 -0800 [SCSI] qla2xxx: Correct IOCB queueing mechanism for ISP54XX HBAs. Original code would incorrectly use non-24xx code-paths. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 4346b14942dbb65e5d4fa7ec0e6567c39861ae6c Author: Andrew Vasquez Date: Wed Dec 13 19:20:28 2006 -0800 [SCSI] qla2xxx: Detect GPSC capabilities within a fabric. Disable subsequent GPSC queries if Fabric Management services do not support the operation. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 71ea9949a307e92fd5f8b4107814014464f38f91 Author: Andrew Vasquez Date: Wed Dec 13 19:20:27 2006 -0800 [SCSI] qla2xxx: Use proper prep_ms_iocb() function during GFPN_ID. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit cdfc82ade68ca11aafc900c56ef2be2b4aea8f58 Author: Andrew Vasquez Date: Wed Dec 13 19:20:26 2006 -0800 [SCSI] qla2xxx: Correct endianess issue while interrogating MS status. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 87b2380fcc6ff97c6ff5afd66ff50e94e6188d6b Author: Andrew Vasquez Date: Wed Dec 13 19:20:25 2006 -0800 [SCSI] qla2xxx: Don't log trace-control async-events. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 9ef3c10e2009d8479b27e3ff39a7779fbca5711c Author: James Bottomley Date: Wed Dec 13 09:19:49 2006 -0600 [SCSI] seagate: remove BROKEN tag Apparently the driver compiles and runs, so tidy up some macro warnings and bring it back as unBROKEN. Signed-off-by: James Bottomley commit 4ed381ee559ebfab32d3b21896c204992c36179a Author: James Bottomley Date: Mon Dec 11 09:47:06 2006 -0600 [SCSI] scsi_transport_spi: fix sense buffer size error The code does this: unsigned char sense[SCSI_SENSE_BUFFERSIZE]; ... scsi_normalize_sense(sense, sizeof(*sense), sshdr) however the sizeof will return 1 not 96 which means the sense data will have no valid ASC/ASCQ values. Fix by putting the correct sense size. The only affected case for this would have been the DV buffer sanity check failure, which is fortunately quite rare. Signed-off-by: James Bottomley commit 8bcc24127be12967588db0ad0e614be937ee1d5a Author: Matthew Wilcox Date: Thu Dec 7 19:29:27 2006 -0700 [SCSI] Add missing completion to scsi_complete_async_scans() If either scsi_complete_async_scans() is called a second time before the first call has finished, or a host scan is started while scsi_complete_async_scans() is still sleeping, it would fail to wake up the other task, which would sleep forever. I've changed the kernel-doc to make it clear that scsi_complete_async_scans() only guarantees that scans which started before it was called are guaranteed to have finished when it returns. I considered making it wait until all scans are completed, but it can't guarantee that no more scans will start before it returns anyway, and it runs the risk of confusing other callers of scsi_complete_async_scans() for hosts actually scanning. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 23be331d9e5077edf07d73813f870d3b895c8593 Author: Adrian Bunk Date: Fri Nov 24 02:46:01 2006 +0100 [SCSI] qla2xxx: make qla2x00_reg_remote_port() static Signed-off-by: Adrian Bunk Acked-by: Andrew Vasquez Signed-off-by: James Bottomley commit d8dafd8ccde06f16095234dc3addf52b511805b3 Author: Randy Dunlap Date: Tue Nov 21 13:50:47 2006 -0800 [SCSI] advansys: wrap PCI table inside ifdef CONFIG_PCI The Advansys ISA/EISA/PCI driver has a compile error when CONFIG_PCI=n, so wrap the pci_device_id table inside ifdef CONFIG_PCI. drivers/scsi/advansys.c: At top level: drivers/scsi/advansys.c:18219: error: array type has incomplete element type drivers/scsi/advansys.c:18221: error: 'PCI_ANY_ID' undeclared here (not in a function) make[2]: *** [drivers/scsi/advansys.o] Error 1 make[1]: *** [drivers/scsi] Error 2 make: *** [drivers] Error 2 Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley