Pull libnvdimm fixes from Dan Williams: "1/ Fixes to the libnvdimm 'pfn' device that establishes a reserved area for storing a struct page array. 2/ Fixes for dax operations on a raw block device to prevent pagecache collisions with dax mappings. 3/ A fix for pfn_t usage in vm_insert_mixed that lead to a null pointer de-reference. These have received build success notification from the kbuild robot across 153 configs and pass the latest ndctl tests" * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: phys_to_pfn_t: use phys_addr_t mm: fix pfn_t to page conversion in vm_insert_mixed block: use DAX for partition table reads block: revert runtime dax control of the raw block device fs, block: force direct-I/O for dax-enabled block devices devm_memremap_pages: fix vmem_altmap lifetime + alignment handling libnvdimm, pfn: fix restoring memmap location libnvdimm: fix mode determination for e820 devices
Showing the changes to include/uapi (1 of 13 files). Show all
Unified · Split
| @@ -222,7 +222,6 @@ struct fsxattr { · 221 unmodified lines | |||
| 222 | #define BLKSECDISCARD _IO(0x12,125) | 222 | #define BLKSECDISCARD _IO(0x12,125) |
| 223 | #define BLKROTATIONAL _IO(0x12,126) | 223 | #define BLKROTATIONAL _IO(0x12,126) |
| 224 | #define BLKZEROOUT _IO(0x12,127) | 224 | #define BLKZEROOUT _IO(0x12,127) |
| 225 | #define BLKDAXSET _IO(0x12,128) | ||
| 226 | #define BLKDAXGET _IO(0x12,129) | 225 | #define BLKDAXGET _IO(0x12,129) |
| 227 | 226 | ||
| 228 | #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ | 227 | #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ |