diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-04-04 18:26:14 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-04-04 18:26:14 +0300 |
| commit | c829a33253e018472335b02e6d8bb1bb4213a142 (patch) | |
| tree | 3da5ab428f3d9f0812f288d32d8893a3f16868b9 /include/linux/errqueue.h | |
| parent | 9c4ad466d1dd2e067d5fdb2fcdbcc30fc5c145f9 (diff) | |
| parent | e1b489d207c73e67810659a88c45b8db4bd62773 (diff) | |
| download | linux-c829a33253e018472335b02e6d8bb1bb4213a142.tar.xz | |
Merge airlied/drm-next into drm-misc-next
Backmerging in order to pull vmwgfx [1] and the new synopsys media
format [2] reqs.
[1]- http://patchwork.freedesktop.org/patch/msgid/20170331233255.GA38850@syeh-m02
[2]- http://patchwork.freedesktop.org/patch/msgid/20170403163544.kcw5kk52tgku5xua@art_vandelay
Signed-off-by: Sean Paul <seanpaul@chromium.org>
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 |