diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-28 11:02:45 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-28 11:02:45 +0300 |
| commit | 4adda532c05fa74602408cea319dcace884f7c67 (patch) | |
| tree | 4b48b611e1b49981428b73ee7267c61c92d2dd65 /include/linux/errqueue.h | |
| parent | 22f880ca8246c6c80c4f48731c6a7d5d15042f56 (diff) | |
| parent | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (diff) | |
| download | linux-4adda532c05fa74602408cea319dcace884f7c67.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at -rc4, which we need to land the 4.12 gvt
patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux/errqueue.h')
| -rw-r--r-- | include/linux/errqueue.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index 9ca23fcfb5d7..6fdfc884fdeb 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h @@ -20,6 +20,8 @@ struct sock_exterr_skb { struct sock_extended_err ee; u16 addr_offset; __be16 port; + u8 opt_stats:1, + unused:7; }; #endif |