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/net/af_vsock.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/net/af_vsock.h')
| -rw-r--r-- | include/net/af_vsock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index db639a4c5ab8..e9eb2d6791b3 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h | |||
| @@ -22,6 +22,9 @@ | |||
| 22 | 22 | ||
| 23 | #include "vsock_addr.h" | 23 | #include "vsock_addr.h" |
| 24 | 24 | ||
| 25 | /* vsock-specific sock->sk_state constants */ | ||
| 26 | #define VSOCK_SS_LISTEN 255 | ||
| 27 | |||
| 25 | #define LAST_RESERVED_PORT 1023 | 28 | #define LAST_RESERVED_PORT 1023 |
| 26 | 29 | ||
| 27 | #define vsock_sk(__sk) ((struct vsock_sock *)__sk) | 30 | #define vsock_sk(__sk) ((struct vsock_sock *)__sk) |