diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 08:38:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 08:38:58 +0100 |
| commit | bb3a151dd42765acc8f469ff994de3ab31f15a95 (patch) | |
| tree | 87cd7da605aacb88aae36f4e69f255537e78e8fa /include/uapi/linux | |
| parent | 1f836f5b10f2524d33efde47d2b694b861ecf319 (diff) | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
| download | cachepc-linux-bb3a151dd42765acc8f469ff994de3ab31f15a95.tar.gz cachepc-linux-bb3a151dd42765acc8f469ff994de3ab31f15a95.zip | |
Merge 5.6-rc5 into char-misc-next
We need the binder and other fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/dm-ioctl.h | 4 |
1 files changed, 2 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 */ |