diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-05 19:42:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-05 19:42:01 -0700 |
| commit | 5198b44374adb3f6143459a03c37f103f8a09548 (patch) | |
| tree | 1d564ca3171f8be01a92404ec68f8005dc9e8f11 /Documentation | |
| parent | 2a171aa21afcd43f6cee574154d8c8db905351e5 (diff) | |
| parent | 3d69d43baa2749c3d187ce70940d7aebe609e149 (diff) | |
| download | linux-5198b44374adb3f6143459a03c37f103f8a09548.tar.gz linux-5198b44374adb3f6143459a03c37f103f8a09548.tar.bz2 linux-5198b44374adb3f6143459a03c37f103f8a09548.zip | |
Merge tag 'for-linus-4.1-1' of git://git.code.sf.net/p/openipmi/linux-ipmi
Pull IPMI fixes from Corey Minyard:
"Lots of minor IPMI fixes, especially ones that have have come up since
the SSIF driver has been in the main kernel for a while"
* tag 'for-linus-4.1-1' of git://git.code.sf.net/p/openipmi/linux-ipmi:
ipmi: Fix multi-part message handling
ipmi: Add alert handling to SSIF
ipmi: Fix a problem that messages are not issued in run_to_completion mode
ipmi: Report an error if ACPI _IFT doesn't exist
ipmi: Remove unused including <linux/version.h>
ipmi: Don't report err in the SI driver for SSIF devices
ipmi: Remove incorrect use of seq_has_overflowed
ipmi:ssif: Ignore spaces when comparing I2C adapter names
ipmi_ssif: Fix the logic on user-supplied addresses
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/IPMI.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt index 653d5d739d7f..31d1d658827f 100644 --- a/Documentation/IPMI.txt +++ b/Documentation/IPMI.txt @@ -505,7 +505,10 @@ at module load time (for a module) with: The addresses are normal I2C addresses. The adapter is the string name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name. -It is *NOT* i2c-<n> itself. +It is *NOT* i2c-<n> itself. Also, the comparison is done ignoring +spaces, so if the name is "This is an I2C chip" you can say +adapter_name=ThisisanI2cchip. This is because it's hard to pass in +spaces in kernel parameters. The debug flags are bit flags for each BMC found, they are: IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8 |