diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-27 23:02:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-27 23:02:07 -0400 |
| commit | 8d49a77568d1105ff3e64aec484dac059f54824e (patch) | |
| tree | 633ee954a3cea97bf136dec933388a2e419e5dac /Documentation | |
| parent | 93567c43eb2a4771b9c590435928f9b3a428e568 (diff) | |
| parent | 1ddd5049545e0aa1a0ed19bca4d9c9c3ce1ac8a2 (diff) | |
Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block: (122 commits)
cciss: fix lost command issue
drbd: need include for bitops functions declarations
Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"
cciss: fix missed command status value CMD_UNABORTABLE
cciss: remove unnecessary casts
cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent
cciss: Inform controller we are using 32-bit tags.
cciss: hoist tag masking out of loop
cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation
cciss: export resettable host attribute
drbd: drop code present under #ifdef which is relevant to 2.6.28 and below
drbd: Fixed handling of read errors on a 'VerifyS' node
drbd: Fixed handling of read errors on a 'VerifyT' node
drbd: Implemented real timeout checking for request processing time
drbd: Remove unused function atodb_endio()
drbd: improve log message if received sector offset exceeds local capacity
drbd: kill dead code
drbd: don't BUG_ON, if bio_add_page of a single page to an empty bio fails
drbd: Removed left over, now wrong comments
drbd: serialize admin requests for new verify run with pending bitmap io
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-pci-devices-cciss | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss b/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss index 4f29e5f1ebfa..f5bb0a3bb8c0 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss +++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss | |||
| @@ -59,3 +59,15 @@ Kernel Version: 2.6.31 | |||
| 59 | Contact: iss_storagedev@hp.com | 59 | Contact: iss_storagedev@hp.com |
| 60 | Description: Displays the usage count (number of opens) of logical drive Y | 60 | Description: Displays the usage count (number of opens) of logical drive Y |
| 61 | of controller X. | 61 | of controller X. |
| 62 | |||
| 63 | Where: /sys/bus/pci/devices/<dev>/ccissX/resettable | ||
| 64 | Date: February 2011 | ||
| 65 | Kernel Version: 2.6.38 | ||
| 66 | Contact: iss_storagedev@hp.com | ||
| 67 | Description: Value of 1 indicates the controller can honor the reset_devices | ||
| 68 | kernel parameter. Value of 0 indicates reset_devices cannot be | ||
| 69 | honored. This is to allow, for example, kexec tools to be able | ||
| 70 | to warn the user if they designate an unresettable device as | ||
| 71 | a dump device, as kdump requires resetting the device in order | ||
| 72 | to work reliably. | ||
| 73 | |||