diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
| commit | 92907cbbef8625bb3998d1eb385fc88f23c97a3f (patch) | |
| tree | 15626ff9287e37c3cb81c7286d6db5a7fd77c854 /include/rdma/ib_pack.h | |
| parent | 15fbfccfe92c62ae8d1ecc647c44157ed01ac02e (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge tag 'v4.4-rc2' into drm-intel-next-queued
Linux 4.4-rc2
Backmerge to get at
commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11 2015 +0200
drm/i915/skl: disable display side power well support for now
so that we can proplery re-eanble skl power wells in -next.
Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/rdma/ib_pack.h')
| -rw-r--r-- | include/rdma/ib_pack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rdma/ib_pack.h b/include/rdma/ib_pack.h index 709a5331e6b9..e99d8f9a4551 100644 --- a/include/rdma/ib_pack.h +++ b/include/rdma/ib_pack.h | |||
| @@ -76,7 +76,7 @@ enum { | |||
| 76 | IB_OPCODE_UC = 0x20, | 76 | IB_OPCODE_UC = 0x20, |
| 77 | IB_OPCODE_RD = 0x40, | 77 | IB_OPCODE_RD = 0x40, |
| 78 | IB_OPCODE_UD = 0x60, | 78 | IB_OPCODE_UD = 0x60, |
| 79 | /* per IBTA 3.1 Table 38, A10.3.2 */ | 79 | /* per IBTA 1.3 vol 1 Table 38, A10.3.2 */ |
| 80 | IB_OPCODE_CNP = 0x80, | 80 | IB_OPCODE_CNP = 0x80, |
| 81 | 81 | ||
| 82 | /* operations -- just used to define real constants */ | 82 | /* operations -- just used to define real constants */ |