summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 12:33:30 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 12:33:30 +1100
commit7080014ae36e7a6067afcf12f133595708d11db8 (patch)
tree925e631a4c87073282d58fadebc85a5aad37ae2c /include/uapi/linux
parente083aec2cf2cb3fbea0b9f68cfbc7c548c36710f (diff)
parent70cc472f9c0dbd12f4ed4e3e869bf763a59a413f (diff)
Merge branch 'device-mapper/master'
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/dm-ioctl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h
index 539b179b349c..b8a6bddf0727 100644
--- a/include/uapi/linux/dm-ioctl.h
+++ b/include/uapi/linux/dm-ioctl.h
@@ -267,9 +267,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 23
-#define DM_VERSION_PATCHLEVEL 1
-#define DM_VERSION_EXTRA "-ioctl (2012-12-18)"
+#define DM_VERSION_MINOR 24
+#define DM_VERSION_PATCHLEVEL 0
+#define DM_VERSION_EXTRA "-ioctl (2013-01-15)"
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */