diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2019-02-22 15:48:13 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-02-22 15:48:13 +0300 |
| commit | b7b14ec1ebef35d22f3f4087816468f22c987f75 (patch) | |
| tree | 3f99f4d7b770d7bba3ee84663b32f98dfbe7582d /include/uapi/linux/errqueue.h | |
| parent | 77ff2c6b49843b01adef1f80abb091753e4c9c65 (diff) | |
| parent | 7a25c6c0aac85bbc50d3ce49cd08888adb14508b (diff) | |
| download | linux-b7b14ec1ebef35d22f3f4087816468f22c987f75.tar.xz | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next to resolve a conflict and to get the mac80211
rhashtable fixes so further patches can be applied on top.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/uapi/linux/errqueue.h')
| -rw-r--r-- | include/uapi/linux/errqueue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h index d955b9e32288..28491dac074b 100644 --- a/include/uapi/linux/errqueue.h +++ b/include/uapi/linux/errqueue.h @@ -3,6 +3,7 @@ #define _UAPI_LINUX_ERRQUEUE_H #include <linux/types.h> +#include <linux/time_types.h> struct sock_extended_err { __u32 ee_errno; |