History

Merge tag 'v5.6-rc5' into rdma.git for-next

Required due to dependencies in following patches.

Jason Gunthorpe committed 6 years ago

Commit 6f00a542 parents 3e3cf2e 2c523b3343 files · +3078 −1738Browse files

Showing the changes to include/uapi (1 of 343 files). Show all

Unified · Split

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 */