Hi Linus, Block fixes/changes that should go into this merge window, but were a little late. Both because of the earlier pull request, but also just late in general (like drbd). This pull request contains: - Dead code removal for loop/sunvdc (Chengguang) - Mark BIDI support for bsg as deprecated, logging a single dmesg warning if anyone is actually using it (Christoph) - blkcg cleanup, killing a dead function and making the tryget_closest variant easier to read (Dennis) - Floppy fixes, one fixing a regression in swim3 (Finn) - lightnvm use-after-free fix (Gustavo) - gdrom leak fix (Wenwen) - Set of drbd updates (Lars, Luc, Nathan, Roland) Please pull! git://git.kernel.dk/linux-block.git tags/for-4.21/block-20190102 ---------------------------------------------------------------- Chengguang Xu (2): block: loop: remove redundant code block: sunvdc: remove redundant code Christoph Hellwig (1): bsg: deprecate BIDI support in bsg Dennis Zhou (2): blkcg: clean up blkg_tryget_closest() blkcg: remove unused __blkg_release_rcu() Finn Thain (4): block/amiflop: Don't log error message on invalid ioctl block/swim3: Remove dead return statement block/swim3: Fix -EBUSY error when re-opening device after unmount block/swim3: Fix regression on PowerBook G3 Gustavo A. R. Silva (1): lightnvm: pblk: fix use-after-free bug Lars Ellenberg (13): drbd: must not use connection after kref_put(&connection->kref) drbd: centralize printk reporting of new size into drbd_set_my_capacity() drbd: ignore "all zero" peer volume sizes in handshake drbd: disconnect, if the wrong UUIDs are attached on a connected peer drbd: fix confusing error message during attach drbd: attach on connected diskless peer must not shrink a consistent device drbd: reject attach of unsuitable uuids even if connected drbd: fix comment typos drbd: do not block when adjusting "disk-options" while IO is frozen drbd: avoid spurious self-outdating with concurrent disconnect / down drbd: don't retry connection if peers do not agree on "authentication" settings drbd: skip spurious timeout (ping-timeo) when failing promote drbd: introduce P_ZEROES (REQ_OP_WRITE_ZEROES on the "wire") Luc Van Oostenryck (1): drbd: fix print_st_err()'s prototype to match the definition Nathan Chancellor (2): drbd: Avoid Clang warning about pointless switch statment drbd: Change drbd_request_detach_interruptible's return type to int Roland Kammerer (1): drbd: narrow rcu_read_lock in drbd_sync_handshake Wenwen Wang (1): gdrom: fix a memory leak bug block/bio.c | 4 + block/blk-cgroup.c | 23 ---- block/bsg.c | 4 + drivers/block/amiflop.c | 2 - drivers/block/drbd/drbd_debugfs.c | 2 + drivers/block/drbd/drbd_int.h | 19 +-- drivers/block/drbd/drbd_main.c | 28 ++++- drivers/block/drbd/drbd_nl.c | 133 ++++++++++++++++---- drivers/block/drbd/drbd_protocol.h | 47 +++++++ drivers/block/drbd/drbd_receiver.c | 251 ++++++++++++++++++++++++++++++++----- drivers/block/drbd/drbd_req.c | 19 +-- drivers/block/drbd/drbd_req.h | 2 + drivers/block/drbd/drbd_state.c | 11 +- drivers/block/drbd/drbd_state.h | 5 +- drivers/block/drbd/drbd_worker.c | 2 +- drivers/block/loop.c | 1 - drivers/block/sunvdc.c | 1 - drivers/block/swim3.c | 14 ++- drivers/cdrom/gdrom.c | 1 + drivers/lightnvm/pblk-recovery.c | 1 - include/linux/blk-cgroup.h | 21 +++- include/linux/drbd.h | 2 +- include/linux/genl_magic_struct.h | 5 +- 23 files changed, 467 insertions(+), 131 deletions(-) -- Jens Axboe