Showing the changes to include/uapi/linux (2 of 595 files). Show all
Unified · Split
| @@ -272,9 +272,9 @@ enum { · 271 unmodified lines | ||
| 272 | 272 | #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) |
| 273 | 273 | |
| 274 | 274 | #define DM_VERSION_MAJOR 4 |
| 275 | −#define DM_VERSION_MINOR 41 | |
| 275 | +#define DM_VERSION_MINOR 42 | |
| 276 | 276 | #define DM_VERSION_PATCHLEVEL 0 |
| 277 | −#define DM_VERSION_EXTRA "-ioctl (2019-09-16)" | |
| 277 | +#define DM_VERSION_EXTRA "-ioctl (2020-02-27)" | |
| 278 | 278 | |
| 279 | 279 | /* Status bits */ |
| 280 | 280 | #define DM_READONLY_FLAG (1 << 0) /* In/Out */ |
| @@ -74,6 +74,8 @@ enum { · 73 unmodified lines | ||
| 74 | 74 | #define IPPROTO_UDPLITE IPPROTO_UDPLITE |
| 75 | 75 | IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */ |
| 76 | 76 | #define IPPROTO_MPLS IPPROTO_MPLS |
| 77 | + IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */ | |
| 78 | +#define IPPROTO_ETHERNET IPPROTO_ETHERNET | |
| 77 | 79 | IPPROTO_RAW = 255, /* Raw IP packets */ |
| 78 | 80 | #define IPPROTO_RAW IPPROTO_RAW |
| 79 | 81 | IPPROTO_MPTCP = 262, /* Multipath TCP connection */ |