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

Linux 4.13-rc7 Signed-off-by: Jens Axboe <axboe@kernel.dk>
2017-08-28 13:00:44 -06:00
parent e9a823fb34 cc4a41fe55
commit cd996fb47c
1034 changed files with 15419 additions and 18261 deletions
--- a/include/uapi/linux/loop.h
+++ b/include/uapi/linux/loop.h
@@ -22,7 +22,6 @@ enum {
 	LO_FLAGS_AUTOCLEAR	= 4,
 	LO_FLAGS_PARTSCAN	= 8,
 	LO_FLAGS_DIRECT_IO	= 16,
-	LO_FLAGS_BLOCKSIZE	= 32,
 };

 #include <asm/posix_types.h>	/* for __kernel_old_dev_t */
@@ -60,8 +59,6 @@ struct loop_info64 {
 	__u64		   lo_init[2];
 };

-#define LO_INFO_BLOCKSIZE(l) (l)->lo_init[0]
-
 /*
 * Loop filter types
 */