diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 16:40:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 16:40:22 -0400 |
| commit | bd381934bf13ccb1af2813ae26c6fe00ec85d254 (patch) | |
| tree | 5275ba0640014793b1b81d52312a581384c335d3 /Documentation | |
| parent | cc9b0b9bea9a0057840261204a6e01c7e19d444c (diff) | |
| parent | 335f2d1b24a350ca8099aea6db5b7adc73666d2f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/addr: Fix resolution of local IPv6 addresses
RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port()
mlx4_core: Add 40GigE device ID
RDMA/iwcm: Don't call provider reject func with irqs disabled
IB: Fix typo in udev rule documentation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/infiniband/user_mad.txt | 4 | ||||
| -rw-r--r-- | Documentation/infiniband/user_verbs.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/infiniband/user_mad.txt b/Documentation/infiniband/user_mad.txt index 744687dd195b..8a366959f5cc 100644 --- a/Documentation/infiniband/user_mad.txt +++ b/Documentation/infiniband/user_mad.txt | |||
| @@ -128,8 +128,8 @@ Setting IsSM Capability Bit | |||
| 128 | To create the appropriate character device files automatically with | 128 | To create the appropriate character device files automatically with |
| 129 | udev, a rule like | 129 | udev, a rule like |
| 130 | 130 | ||
| 131 | KERNEL="umad*", NAME="infiniband/%k" | 131 | KERNEL=="umad*", NAME="infiniband/%k" |
| 132 | KERNEL="issm*", NAME="infiniband/%k" | 132 | KERNEL=="issm*", NAME="infiniband/%k" |
| 133 | 133 | ||
| 134 | can be used. This will create device nodes named | 134 | can be used. This will create device nodes named |
| 135 | 135 | ||
diff --git a/Documentation/infiniband/user_verbs.txt b/Documentation/infiniband/user_verbs.txt index f847501e50b5..afe3f8da9018 100644 --- a/Documentation/infiniband/user_verbs.txt +++ b/Documentation/infiniband/user_verbs.txt | |||
| @@ -58,7 +58,7 @@ Memory pinning | |||
| 58 | To create the appropriate character device files automatically with | 58 | To create the appropriate character device files automatically with |
| 59 | udev, a rule like | 59 | udev, a rule like |
| 60 | 60 | ||
| 61 | KERNEL="uverbs*", NAME="infiniband/%k" | 61 | KERNEL=="uverbs*", NAME="infiniband/%k" |
| 62 | 62 | ||
| 63 | can be used. This will create device nodes named | 63 | can be used. This will create device nodes named |
| 64 | 64 | ||