History

Merge tag 'v4.13-rc7' into for-4.14/block-postmerge

Linux 4.13-rc7

Jens Axboe committed 9 years ago

Commit cd996fb2 parents e9a823f cc4a41f1034 files · +15391 −18233Browse files

Showing the changes to include/uapi/linux (1 of 1034 files). Show all

Unified · Split

include/uapi/linux/loop.h+0−3
@@ -22,7 +22,6 @@ enum { · 21 unmodified lines
22 LO_FLAGS_AUTOCLEAR = 4,22 LO_FLAGS_AUTOCLEAR = 4,
23 LO_FLAGS_PARTSCAN = 8,23 LO_FLAGS_PARTSCAN = 8,
24 LO_FLAGS_DIRECT_IO = 16,24 LO_FLAGS_DIRECT_IO = 16,
25 LO_FLAGS_BLOCKSIZE = 32,
26};25};
27 26
28#include <asm/posix_types.h> /* for __kernel_old_dev_t */27#include <asm/posix_types.h> /* for __kernel_old_dev_t */
@@ -60,8 +59,6 @@ struct loop_info64 { · 31 unmodified lines
60 __u64 lo_init[2];59 __u64 lo_init[2];
61};60};
62 61
63#define LO_INFO_BLOCKSIZE(l) (l)->lo_init[0]
64
65/*62/*
66 * Loop filter types63 * Loop filter types
67 */64 */