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

Merge branch 'for-4.7/dax' into libnvdimm-for-next

Browse source
This commit is contained in:
Dan Williams 2016-05-21 12:33:04 -07:00
commit 36092ee8ba
26 changed files with 935 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/uapi/linux/fs.h
View file

@ -222,7 +222,6 @@ struct fsxattr {
#define BLKSECDISCARD _IO(0x12,125)
#define BLKROTATIONAL _IO(0x12,126)
#define BLKZEROOUT _IO(0x12,127)
#define BLKDAXGET _IO(0x12,129)
#define BMAP_IOCTL 1 /* obsolete - kept for compatibility */
#define FIBMAP _IO(0x00,1) /* bmap access */