kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2

Browse source
This commit is contained in:
Mike Snitzer 2015-05-29 14:17:16 -04:00
commit 183f7802e7
54 changed files with 573 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/uapi/linux/nbd.h
View file

@ -44,8 +44,6 @@ enum {
/* there is a gap here to match userspace */
#define NBD_FLAG_SEND_TRIM (1 << 5) /* send trim/discard */
#define nbd_cmd(req) ((req)->cmd[0])
/* userspace doesn't need the nbd_device structure */
/* These are sent over the network in the request/reply magic fields */