diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 14:32:45 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 14:32:45 +0300 |
| commit | 4c805fb704fc7890ec6615b286f09aeb5e2603d4 (patch) | |
| tree | 24f79be444c9dd3df7116037fd3bd3e17b01ebd3 /include/uapi/linux | |
| parent | f454d9a378a1ccb676adfa6e2449ef17e66696b5 (diff) | |
| parent | 77a36a3ab4ff17fad23831192e3694a3c5a1750d (diff) | |
| download | linux-4c805fb704fc7890ec6615b286f09aeb5e2603d4.tar.xz | |
Merge branch 'for-5.7/glorious' into for-linus
- report descriptor fix for Glorious PC Gaming Race device from Samuel Čavoj
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/dm-ioctl.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/in.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h index 2df8ceca1f9b..6622912c2342 100644 --- a/include/uapi/linux/dm-ioctl.h +++ b/include/uapi/linux/dm-ioctl.h @@ -272,9 +272,9 @@ enum { #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) #define DM_VERSION_MAJOR 4 -#define DM_VERSION_MINOR 41 +#define DM_VERSION_MINOR 42 #define DM_VERSION_PATCHLEVEL 0 -#define DM_VERSION_EXTRA "-ioctl (2019-09-16)" +#define DM_VERSION_EXTRA "-ioctl (2020-02-27)" /* Status bits */ #define DM_READONLY_FLAG (1 << 0) /* In/Out */ diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h index 1521073b6348..8533bf07450f 100644 --- a/include/uapi/linux/in.h +++ b/include/uapi/linux/in.h @@ -74,6 +74,8 @@ enum { #define IPPROTO_UDPLITE IPPROTO_UDPLITE IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */ #define IPPROTO_MPLS IPPROTO_MPLS + IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */ +#define IPPROTO_ETHERNET IPPROTO_ETHERNET IPPROTO_RAW = 255, /* Raw IP packets */ #define IPPROTO_RAW IPPROTO_RAW IPPROTO_MPTCP = 262, /* Multipath TCP connection */ |