History

Merge branch 'perf/urgent' into perf/core, to pick up fixes

Ingo Molnar committed 6 years ago

Commit 409e1a32 parents fdca7c1 db5d85c595 files · +5242 −2445Browse files

Showing the changes to include/uapi/linux (2 of 595 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/dm-ioctl.h +2 −2
  2. include/uapi/linux/in.h +2 −0
include/uapi/linux/dm-ioctl.h+2−2
@@ -272,9 +272,9 @@ enum { · 271 unmodified lines
272#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)272#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
273 273
274#define DM_VERSION_MAJOR 4274#define DM_VERSION_MAJOR 4
275#define DM_VERSION_MINOR 41275#define DM_VERSION_MINOR 42
276#define DM_VERSION_PATCHLEVEL 0276#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/* Status bits */279/* Status bits */
280#define DM_READONLY_FLAG (1 << 0) /* In/Out */280#define DM_READONLY_FLAG (1 << 0) /* In/Out */
include/uapi/linux/in.h+2−0
@@ -74,6 +74,8 @@ enum { · 73 unmodified lines
74#define IPPROTO_UDPLITE IPPROTO_UDPLITE74#define IPPROTO_UDPLITE IPPROTO_UDPLITE
75 IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */75 IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */
76#define IPPROTO_MPLS IPPROTO_MPLS76#define IPPROTO_MPLS IPPROTO_MPLS
77 IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */
78#define IPPROTO_ETHERNET IPPROTO_ETHERNET
77 IPPROTO_RAW = 255, /* Raw IP packets */79 IPPROTO_RAW = 255, /* Raw IP packets */
78#define IPPROTO_RAW IPPROTO_RAW80#define IPPROTO_RAW IPPROTO_RAW
79 IPPROTO_MPTCP = 262, /* Multipath TCP connection */81 IPPROTO_MPTCP = 262, /* Multipath TCP connection */