Merge remote-tracking branch 'block/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/ioctl.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/target/target_core_iblock.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc init/Kconfig
index 186a482311a035729374214a9c56c1a3204cdd03,75633d3db5c901a957f2758a57c4561cfe6f059c..1ced40bf80f04270f71708d39ca0cb0d7d02d878
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -1003,8 -1019,10 +1003,7 @@@ config UIDGID_CONVERTE
        depends on !UML || HOSTFS = n
  
        # The rare drivers that won't build
 -      depends on AIRO = n
 -      depends on AIRO_CS = n
 -      depends on TUN = n
        depends on INFINIBAND_QIB = n
-       depends on BLK_DEV_LOOP = n
        depends on ANDROID_BINDER_IPC = n
  
        # Security modules