leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Required due to dependencies in following patches.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Jason Gunthorpe
2020-03-10 12:49:09 -03:00
parent 3e3cf2e82c 2c523b344d
commit 6f00a54c2c
343 changed files with 3086 additions and 1746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/uapi/linux/dm-ioctl.h
View File

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